Hopefully this works....

This commit is contained in:
Scott Idem
2024-03-07 22:08:15 -05:00
parent f1a36b2bc4
commit 3e72c4299c
3 changed files with 149 additions and 19 deletions

View File

@@ -52,7 +52,7 @@ services:
# - ./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_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
@@ -68,7 +68,7 @@ services:
# volumes_from:
# - nextcloud25
depends_on:
- php7
# - php7
- aether_api_gunicorn
# - aether_api_v5_gunicorn
- aether_app_gunicorn
@@ -81,25 +81,25 @@ services:
# 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
# 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
# - ./conf/php/custom_php7.ini:/usr/local/etc/php/conf.d/custom_php7.ini
- ./logs/php7:/logs
# ports:
# - "9007:9000"
# networks:
# - local-net
# - ./logs/php7:/logs
# # ports:
# # - "9007:9000"
# # networks:
# # - local-net
# phpmyadmin:
# image: phpmyadmin
@@ -128,6 +128,7 @@ services:
# # default port is 6379
# - "${AE_REDIS_PORT}:6379"
# API - Default
aether_api_gunicorn:
restart: always
container_name: ${CONTAINER_AE_API}
@@ -165,6 +166,121 @@ services:
stdin_open: true # docker run -i
tty: true # docker run -t
# API - Red
aether_api_gunicorn_red:
restart: always
container_name: ${CONTAINER_AE_API_RED}
build:
# context: ./builds
context: ./
dockerfile: aether_fastapi_gunicorn.Dockerfile
env_file:
- ./.env
ports:
- "${AE_API_GUNICORN_PORT_RED}:5005"
extra_hosts:
- "${DOCKER_AE_SERVER_EXTRA_HOST}"
# expose:
# - 5005
# networks:
# - local-net
volumes:
- ./conf/aether_fastapi_gunicorn_conf.py:/conf/gunicorn_fastapi_conf.py
- ./conf/aether_fastapi_requirements_current.txt:/requirements_current.txt
- ./conf/aether_api_config.py:/srv/aether_api/app/config.py
- ./logs/ae_api_red:/logs
- ./srv/aether_api_ln:/srv/aether_api
- ./srv/hosted_files_ln:/srv/hosted_files
- ./srv/hosted_tmp_ln:/srv/hosted_tmp
# - ./tmp/ae_api:/tmp
- ./temp/ae_api:/temp
# links:
# - redis
depends_on:
- redis
stdin_open: true # docker run -i
tty: true # docker run -t
# API - Blue
aether_api_gunicorn_blue:
restart: always
container_name: ${CONTAINER_AE_API_BLUE}
build:
# context: ./builds
context: ./
dockerfile: aether_fastapi_gunicorn.Dockerfile
env_file:
- ./.env
ports:
- "${AE_API_GUNICORN_PORT_BLUE}:5005"
extra_hosts:
- "${DOCKER_AE_SERVER_EXTRA_HOST}"
# expose:
# - 5005
# networks:
# - local-net
volumes:
- ./conf/aether_fastapi_gunicorn_conf.py:/conf/gunicorn_fastapi_conf.py
- ./conf/aether_fastapi_requirements_current.txt:/requirements_current.txt
- ./conf/aether_api_config.py:/srv/aether_api/app/config.py
- ./logs/ae_api_blue:/logs
- ./srv/aether_api_ln:/srv/aether_api
- ./srv/hosted_files_ln:/srv/hosted_files
- ./srv/hosted_tmp_ln:/srv/hosted_tmp
# - ./tmp/ae_api:/tmp
- ./temp/ae_api:/temp
# links:
# - redis
depends_on:
- redis
stdin_open: true # docker run -i
tty: true # docker run -t
# API - Green
aether_api_gunicorn_green:
restart: always
container_name: ${CONTAINER_AE_API_GREEN}
build:
# context: ./builds
context: ./
dockerfile: aether_fastapi_gunicorn.Dockerfile
env_file:
- ./.env
ports:
- "${AE_API_GUNICORN_PORT_GREEN}:5005"
extra_hosts:
- "${DOCKER_AE_SERVER_EXTRA_HOST}"
# expose:
# - 5005
# networks:
# - local-net
volumes:
- ./conf/aether_fastapi_gunicorn_conf.py:/conf/gunicorn_fastapi_conf.py
- ./conf/aether_fastapi_requirements_current.txt:/requirements_current.txt
- ./conf/aether_api_config.py:/srv/aether_api/app/config.py
- ./logs/ae_api_green:/logs
- ./srv/aether_api_ln:/srv/aether_api
- ./srv/hosted_files_ln:/srv/hosted_files
- ./srv/hosted_tmp_ln:/srv/hosted_tmp
# - ./tmp/ae_api:/tmp
- ./temp/ae_api:/temp
# links:
# - redis
depends_on:
- redis
stdin_open: true # docker run -i
tty: true # docker run -t
# aether_api_v5_gunicorn:
# restart: always
# container_name: ae_api_v5_dev