xai-corp.net/provisioning
1
0
Fork 0
Code Issues 9 Releases Activity

update sslproxy host for nextcloud

Browse Source 
add healthcheck to nextcloud containers.
This commit is contained in:
Richard Morgan
2018-11-02 06:53:20 -04:00
parent 05b49ce49f
commit 41b35c8689
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dockerfiles/services/nextcloud/Dockerfile-mono
View File

@@ -1,4 +1,4 @@
FROM nextcloud:13-apache FROM nextcloud:14-apache
RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/*

2
dockerfiles/services/nextcloud/deploy.sh
View File

@@ -5,3 +5,5 @@ export DOCKER_HOST=dkmanager:2376
docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml xaibox docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml xaibox
docker service update -q xaibox_app

6
dockerfiles/services/nextcloud/docker-compose-mono.yml
View File

@@ -2,8 +2,8 @@
# docker-compose file for nextcloud server # docker-compose file for nextcloud server
# docker login dkregistry.xai-corp.net:5000 # docker login dkregistry.xai-corp.net:5000
# docker-compose -f docker-compose-mono.yml build && docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest # docker-compose -f docker-compose-mono.yml build && docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:14
# DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml owncloud # DOCKER_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml xaibox
version: '2' version: '2'
services: services:
@@ -12,4 +12,4 @@ services:
build: build:
context: . context: .
dockerfile: ./Dockerfile-mono dockerfile: ./Dockerfile-mono
image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:13 image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:14

22
dockerfiles/services/nextcloud/docker-compose-prod.yml
View File

@@ -29,7 +29,15 @@ services:
- DBPASS=xh891hx1hc89f239hibndnxc1i - DBPASS=xh891hx1hc89f239hibndnxc1i
- REDISHOST=tasks.services_redis - REDISHOST=tasks.services_redis
- REDISPORT=6379 - REDISPORT=6379
- LOGLEVEL=3 - LOGLEVEL=0
healthcheck:
test: ["CMD", "curl", "-If", "http://localhost/status.php"]
interval: 1m30s
timeout: 10s
retries: 3
start_period: 40s
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
@@ -51,12 +59,12 @@ services:
- prod_db - prod_db
- prod_cache - prod_cache
logging: # logging:
driver: fluentd # driver: fluentd
options: # options:
fluentd-address: "logs.xai-corp.net:24224" # fluentd-address: "logs.xai-corp.net:24224"
fluentd-async-connect: 'true' # fluentd-async-connect: 'true'
tag: nextcloud # tag: nextcloud
# web: # web:

7
dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf
View File

@@ -21,7 +21,12 @@ server {
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
location / { location / {
proxy_set_header Connection $http_connection; proxy_set_header Connection $http_connection;
proxy_set_header Host $host:$server_port;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://xaibox_upstream; proxy_pass http://xaibox_upstream;
} }