Scott.Idem/OSIT-AE-Docker-Env
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up before wrapping up for the night. Seems to be working well.

Browse Source
This commit is contained in:
Scott Idem
2024-02-14 20:37:18 -05:00
parent 56da44234a
commit d265064cf6
1 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
docker-compose.yml
View File

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