update sslproxy host for nextcloud
add healthcheck to nextcloud containers.
This commit is contained in:
@@ -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/*
|
||||
|
||||
@@ -5,3 +5,5 @@ export DOCKER_HOST=dkmanager:2376
|
||||
docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
|
||||
|
||||
docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml xaibox
|
||||
|
||||
docker service update -q xaibox_app
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# docker-compose file for nextcloud server
|
||||
|
||||
# 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_HOST=dkhost:2376 docker stack deploy --with-registry-auth -c docker-compose-prod.yml owncloud
|
||||
# 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 xaibox
|
||||
|
||||
version: '2'
|
||||
services:
|
||||
@@ -12,4 +12,4 @@ services:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: ./Dockerfile-mono
|
||||
image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:13
|
||||
image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:14
|
||||
|
||||
@@ -29,7 +29,15 @@ services:
|
||||
- DBPASS=xh891hx1hc89f239hibndnxc1i
|
||||
- REDISHOST=tasks.services_redis
|
||||
- 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:
|
||||
mode: replicated
|
||||
replicas: 1
|
||||
@@ -51,12 +59,12 @@ services:
|
||||
- prod_db
|
||||
- prod_cache
|
||||
|
||||
logging:
|
||||
driver: fluentd
|
||||
options:
|
||||
fluentd-address: "logs.xai-corp.net:24224"
|
||||
fluentd-async-connect: 'true'
|
||||
tag: nextcloud
|
||||
# logging:
|
||||
# driver: fluentd
|
||||
# options:
|
||||
# fluentd-address: "logs.xai-corp.net:24224"
|
||||
# fluentd-async-connect: 'true'
|
||||
# tag: nextcloud
|
||||
|
||||
|
||||
# web:
|
||||
|
||||
@@ -22,6 +22,11 @@ server {
|
||||
|
||||
location / {
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user