From d5153cda766976e96fec9a3a8cb8ff37d96b30b0 Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Tue, 6 Jan 2026 19:14:25 -0500
Subject: [PATCH] Cleanup: Remove commented-out services (Nextcloud, PHP7, PMA)
 from docker-compose.yml

---
 docker-compose.yml | 65 ----------------------------------------------
 1 file changed, 65 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 63df1c7..39fb017 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,26 +35,12 @@ services:
             - ./srv/hosted_files_ln:/srv/hosted_files
             - ./srv/hosted_tmp_ln:/srv/hosted_tmp
 
-            # NOTE: Nextcloud Docker container requires (sort of) the path to be /var/www/html
-            # - ./srv/nextcloud:/srv/nextcloud
-            # - ./srv/nextcloud/app:/var/www/html
-            # - ./srv/nextcloud/apps:/var/www/html/apps
-            # - ./srv/nextcloud/config:/var/www/html/config
-            # - ./srv/nextcloud/data:/var/www/html/data
-
             # - ./conf/nginx/nginx.conf:/etc/nginx/nginx.conf
             - ./conf/nginx/options-ssl-nginx.conf:/etc/nginx/options-ssl-nginx.conf
             # - ./conf/nginx/other.conf:/etc/nginx/conf.d/other.conf
 
             - ./conf/nginx/site.conf:/etc/nginx/conf.d/0_site.conf
 
-            # - ./conf/nginx/site-enabled_aether-mailman2.conf:/etc/nginx/conf.d/site-enabled_aether-mailman2.conf
-            # - ./conf/nginx/site-enabled_aether-nextcloud.conf:/etc/nginx/conf.d/site-enabled_aether-nextcloud.conf
-            # - ./conf/nginx/site-enabled_aether-phpmyadmin.conf:/etc/nginx/templates/site-enabled_aether-phpmyadmin.conf.template
-
-            # - ./conf/nginx/site-enabled_oneskyit.conf:/etc/nginx/conf.d/site-enabled_oneskyit.conf
-            # - ./conf/nginx/site-enabled_oneskyit.conf:/etc/nginx/templates/site-enabled_oneskyit.conf.template
-
             - ./conf/nginx/site-enabled_aether_fastapi_gunicorn.conf:/etc/nginx/templates/site-enabled_aether_fastapi_gunicorn.conf.template
             # - ./conf/nginx/site-enabled_aether_api_v5_fastapi_gunicorn.conf:/etc/nginx/templates/site-enabled_aether_api_v5_fastapi_gunicorn.conf.template
             - ./conf/nginx/site-enabled_aether_flask_gunicorn.conf:/etc/nginx/templates/site-enabled_aether_flask_gunicorn.conf.template
@@ -66,8 +52,6 @@ services:
             - ./conf/certs/ssl-dhparams.pem:/etc/certs/ssl-dhparams.pem
 
             - ./logs/web:/logs
-        # volumes_from:
-        #     - nextcloud25
         depends_on:
             # - php7
             # - aether_api_gunicorn
@@ -75,48 +59,7 @@ services:
             - aether_api_gunicorn_green
             # - aether_api_v5_gunicorn
             - aether_app_gunicorn
-        # links:
-        #     # - nextcloud25
-        #     - php7
-        #     - aether_api_gunicorn
-        #     - aether_app_gunicorn
-        #     # - aether_api_gunicorn_bak
-        # stdin_open: true # docker run -i
-        # tty: true        # docker run -t
 
-    # php7:
-    #     restart: always
-    #     container_name: ${CONTAINER_PHP7}
-    #     # image: php:fpm
-    #     build:
-    #         context: ./
-    #         dockerfile: php7.Dockerfile
-    #     volumes:
-    #         - ./srv/html_php:/srv/html_php
-    #         - ./srv/oneskyit_site:/srv/oneskyit_site
-    #         # - ./srv/nextcloud:/srv/nextcloud
-
-    #         - ./conf/php/custom_php7.ini:/usr/local/etc/php/conf.d/custom_php7.ini
-
-    #         - ./logs/php7:/logs
-    #     # ports:
-    #     #     - "9007:9000"
-    #     # networks:
-    #     #   - local-net
-
-    # phpmyadmin:
-    #     image: phpmyadmin
-    #     container_name: ae_phpmyadmin
-    #     restart: unless-stopped
-    #     depends_on:
-    #         - mariadb
-    #     ports:
-    #         - 8888:80
-    #     env_file:
-    #        - ./.env
-    #     environment:
-    #         - PMA_ARBITRARY=1
-    #         - UPLOAD_LIMIT=1G
 
     # Need to fix the memory overcommit warning from Redis
     # https://ourcodeworld.com/articles/read/2083/how-to-remove-redis-warning-on-docker-memory-overcommit-must-be-enabled
@@ -427,11 +370,3 @@ services:
             - aether_api_gunicorn_green
         stdin_open: true # docker run -i
         tty: true        # docker run -t
-
-# networks:
-#   local-net:
-#     driver: bridge
-
-# volumes:
-#   ./tmp/ae_app:
-#     external: true