return xaibox to using php+apache image

This commit is contained in:
2018-04-07 09:49:09 -04:00
parent 83ec6809d6
commit bbc06bae70
6 changed files with 53 additions and 60 deletions

View File

@@ -13,13 +13,13 @@ services:
app:
image: "dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest"
# ports:
# - 8083:80
ports:
- 8083:80
volumes:
# - code:/var/www/html
- /opt/nextcloud/nextcloud2/data:/var/www/html/data
- /opt/nextcloud/nextcloud2/config:/var/www/html/config
- /opt/nextcloud/nextcloud2/apps:/var/www/html/custom_apps
- /opt/nextcloud/nextcloud1/data:/var/www/html/data
- /opt/nextcloud/nextcloud1/config:/var/www/html/config
- /opt/nextcloud/nextcloud1/apps:/var/www/html/custom_apps
environment:
- DBTYPE=mysql
- DBHOST=sql.xai-corp.net
@@ -46,6 +46,7 @@ services:
memory: 512M
networks:
- prod_ui
- prod_app
- prod_db
- prod_cache
@@ -58,40 +59,40 @@ services:
# tag: nextcloud
#
web:
image: "dkregistry.xai-corp.net:5000/xaicorp/nextcloud-web:latest"
ports:
- 8083:80
volumes:
- cache:/data/nginx/cache/nextcloud
# - code:/var/www/html
- /opt/nextcloud/nextcloud2/data:/var/www/html/data
- /opt/nextcloud/nextcloud2/config:/var/www/html/config
- /opt/nextcloud/nextcloud2/apps:/var/www/html/custom_apps
deploy:
mode: replicated
replicas: 1
restart_policy:
condition: any
delay: "30s"
max_attempts: 5
update_config:
parallelism: 1
delay: 2s
order: start-first
resources:
limits:
# cpus: '1'
memory: 512M
# healthcheck:
# test: curl -f http://localhost ||exit 1
# interval: 1m30s
# timeout: 1s
# retries: 2
networks:
- prod_ui
- prod_app
# web:
# image: "dkregistry.xai-corp.net:5000/xaicorp/nextcloud-web:latest"
# ports:
# - 8083:80
# volumes:
# - cache:/data/nginx/cache/nextcloud
## - code:/var/www/html
# - /opt/nextcloud/nextcloud2/data:/var/www/html/data
# - /opt/nextcloud/nextcloud2/config:/var/www/html/config
# - /opt/nextcloud/nextcloud2/apps:/var/www/html/custom_apps
#
# deploy:
# mode: replicated
# replicas: 1
# restart_policy:
# condition: any
# delay: "30s"
# max_attempts: 5
# update_config:
# parallelism: 1
# delay: 2s
# order: start-first
# resources:
# limits:
## cpus: '1'
# memory: 512M
## healthcheck:
## test: curl -f http://localhost ||exit 1
## interval: 1m30s
## timeout: 1s
## retries: 2
# networks:
# - prod_ui
# - prod_app
networks:
prod_ui: