From d265064cf64964307d87ed5eff3b943818290f30 Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Wed, 14 Feb 2024 20:37:18 -0500
Subject: [PATCH] Clean up before wrapping up for the night. Seems to be
 working well.

---
 docker-compose.yml | 44 ++++++++++++++------------------------------
 1 file changed, 14 insertions(+), 30 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e981342..4ccae93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -121,42 +121,25 @@ services:
     #         # - ./customcert.pem:/etc/ssl/certs/ssl-cert-snakeoil.pem
     #         # - ./customcertkey.key:/etc/ssl/private/ssl-cert-snakeoil.key
 
-    # php5:
+    # php7:
     #     restart: always
-    #     container_name: ae_php5_dev
-    #     # image: php:5-fpm
+    #     container_name: ${CONTAINER_PHP7}
+    #     # image: php:fpm
     #     build:
     #         context: ./
-    #         dockerfile: php5.Dockerfile
+    #         dockerfile: php7.Dockerfile
     #     volumes:
     #         - ./srv/html_php:/srv/html_php
-    #
-    #         - ./conf/php/custom_php5.ini:/usr/local/etc/php/conf.d/custom_php5.ini
-    #
-    #         - ./logs:/logs
-    #     ports:
-    #         - "9005:9000"
+    #         - ./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
-    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
@@ -333,10 +316,11 @@ services:
         # networks:
         #   - local-net
         extra_hosts:
-             # - dev-api.oneskyit.com:192.168.32.20
+             - "${DOCKER_AE_SERVER_EXTRA_HOST}"
              - "${DOCKER_AE_API_SERVER_EXTRA_HOST}"
              - "${DOCKER_AE_API_BAK_SERVER_EXTRA_HOST}"
              - "${DOCKER_AE_API_V5_SERVER_EXTRA_HOST}"
+             # - dev-api.oneskyit.com:192.168.32.20
         volumes:
             - ./conf/aether_flask_gunicorn_conf.py:/conf/gunicorn_flask_conf.py
             - ./conf/aether_flask_requirements_current.txt:/requirements_current.txt