diff --git a/dockerfiles/services/nextcloud/Dockerfile-mono b/dockerfiles/services/nextcloud/Dockerfile-mono new file mode 100755 index 0000000..64b097a --- /dev/null +++ b/dockerfiles/services/nextcloud/Dockerfile-mono @@ -0,0 +1,6 @@ +FROM nextcloud:stable-apache + + +RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/* + +#COPY php/errorlog.conf /usr/local/etc/php-fpm.d/errorlog.conf diff --git a/dockerfiles/services/nextcloud/docker-compose-build.yml b/dockerfiles/services/nextcloud/docker-compose-build.yml index 54ae579..d12ea7b 100755 --- a/dockerfiles/services/nextcloud/docker-compose-build.yml +++ b/dockerfiles/services/nextcloud/docker-compose-build.yml @@ -8,14 +8,8 @@ version: '2' services: - xaicloud: + mono: build: context: . - dockerfile: ./Dockerfile + dockerfile: ./Dockerfile-mono image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest - - web: - build: - context: . - dockerfile: ./Dockerfile-web - image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud-web:latest diff --git a/dockerfiles/services/nextcloud/docker-compose-prod.yml b/dockerfiles/services/nextcloud/docker-compose-prod.yml index a9dea50..ed7b942 100755 --- a/dockerfiles/services/nextcloud/docker-compose-prod.yml +++ b/dockerfiles/services/nextcloud/docker-compose-prod.yml @@ -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: diff --git a/dockerfiles/services/nextcloud/docker-compose.yml b/dockerfiles/services/nextcloud/docker-compose.yml index 182048f..5e2e8f9 100755 --- a/dockerfiles/services/nextcloud/docker-compose.yml +++ b/dockerfiles/services/nextcloud/docker-compose.yml @@ -24,8 +24,10 @@ services: - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - xaicloud: + app: image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest + ports: + - 8083:80 volumes: # - nextcloud:/var/www/html - ./config:/var/www/html/config @@ -41,16 +43,6 @@ services: - REDISPORT=6379 - LOGLEVEL=3 - web: - image: dkregistry.xai-corp.net:5000/xaicorp/nextcloud-web:latest - ports: - - 8083:80 - volumes: - - cache:/data/nginx/cache/nextcloud -# - nextcloud:/var/www/html - - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro - - ./config:/var/www/html/config - memcached: image: "memcached:alpine" ports: diff --git a/dockerfiles/services/nextcloud/nginx.conf b/dockerfiles/services/nextcloud/nginx.conf index 07d277d..4cb45b5 100755 --- a/dockerfiles/services/nextcloud/nginx.conf +++ b/dockerfiles/services/nextcloud/nginx.conf @@ -3,7 +3,7 @@ proxy_cache_path /data/nginx/cache/nextcloud levels=1:2 keys_zone=my_cache:10m m upstream xaibox_upstream { - server tasks.xaibox_app:9000; + server app:9000; } server { diff --git a/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf b/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf index d98a232..289ba7c 100644 --- a/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf +++ b/dockerfiles/services/sslproxy/hosts/xaibox.xai-corp.net.conf @@ -2,7 +2,7 @@ proxy_cache_path /data/nginx/cache/xaibox levels=1:2 keys_zone=xaibox:10m max_si inactive=60m use_temp_path=off; upstream xaibox_upstream { - server tasks.xaibox_web:8083; + server tasks.xaibox_app:8083; server xaibox.xai-corp.net:8083 backup; server dkhost.xai-corp.net:8083 backup;