return xaibox to using php+apache image

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

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

dockerfiles/services/nextcloud/docker-compose-prod.yml

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

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:

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 {

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;