Clean up to go live
This commit is contained in:
Scott Idem
@@ -49,14 +49,13 @@ services:
|
|||||||
|
|
||||||
# - ./conf/nginx/site-enabled_aether-mailman2.conf:/etc/nginx/conf.d/site-enabled_aether-mailman2.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-nextcloud.conf:/etc/nginx/conf.d/site-enabled_aether-nextcloud.conf
|
||||||
# - ./conf/nginx/site-enabled_aether-phpmyadmin.conf:/etc/nginx/conf.d/site-enabled_aether-phpmyadmin.conf
|
# - ./conf/nginx/site-enabled_aether-phpmyadmin.conf:/etc/nginx/templates/site-enabled_aether-phpmyadmin.conf.template
|
||||||
- ./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/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_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_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
|
- ./conf/nginx/site-enabled_aether_flask_gunicorn.conf:/etc/nginx/templates/site-enabled_aether_flask_gunicorn.conf.template
|
||||||
|
|
||||||
- ./conf/certs/fullchain.pem:/etc/certs/fullchain.pem
|
- ./conf/certs/fullchain.pem:/etc/certs/fullchain.pem
|
||||||
@@ -67,9 +66,9 @@ services:
|
|||||||
# volumes_from:
|
# volumes_from:
|
||||||
# - nextcloud25
|
# - nextcloud25
|
||||||
depends_on:
|
depends_on:
|
||||||
- php7
|
# - php7
|
||||||
- aether_api_gunicorn
|
- aether_api_gunicorn
|
||||||
- aether_api_v5_gunicorn
|
# - aether_api_v5_gunicorn
|
||||||
- aether_app_gunicorn
|
- aether_app_gunicorn
|
||||||
# links:
|
# links:
|
||||||
# # - nextcloud25
|
# # - nextcloud25
|
||||||
@@ -157,46 +156,46 @@ services:
|
|||||||
# networks:
|
# networks:
|
||||||
# - local-net
|
# - local-net
|
||||||
|
|
||||||
phpmyadmin:
|
# phpmyadmin:
|
||||||
image: phpmyadmin
|
# image: phpmyadmin
|
||||||
container_name: ae_phpmyadmin
|
# container_name: ae_phpmyadmin
|
||||||
restart: unless-stopped
|
# restart: unless-stopped
|
||||||
depends_on:
|
# depends_on:
|
||||||
- mariadb
|
# - mariadb
|
||||||
ports:
|
# ports:
|
||||||
- 8888:80
|
# - 8888:80
|
||||||
env_file:
|
# env_file:
|
||||||
- ./.env
|
# - ./.env
|
||||||
environment:
|
# environment:
|
||||||
- PMA_ARBITRARY=1
|
# - PMA_ARBITRARY=1
|
||||||
- UPLOAD_LIMIT=1G
|
# - UPLOAD_LIMIT=1G
|
||||||
|
|
||||||
mariadb:
|
# mariadb:
|
||||||
container_name: ae_mariadb_dev
|
# container_name: ae_mariadb_dev
|
||||||
# image: mariadb/server:latest
|
# # image: mariadb/server:latest
|
||||||
image: mariadb:10.9
|
# image: mariadb:10.9
|
||||||
# image: mariadb:10.6
|
# # image: mariadb:10.6
|
||||||
restart: unless-stopped
|
# restart: unless-stopped
|
||||||
# env_file:
|
# # env_file:
|
||||||
# - ./.env
|
# # - ./.env
|
||||||
# - filename.env
|
# # - filename.env
|
||||||
# ports:
|
# # ports:
|
||||||
# - "3307:3306"
|
# # - "3307:3306"
|
||||||
volumes:
|
# volumes:
|
||||||
- ./srv/mariadb:/var/lib/mysql
|
# - ./srv/mariadb:/var/lib/mysql
|
||||||
# - ./conf/mariadb/password_reset.sql:/docker-entrypoint-initdb.d/init.sql:ro
|
# # - ./conf/mariadb/password_reset.sql:/docker-entrypoint-initdb.d/init.sql:ro
|
||||||
# - ./conf/mariadb/password_reset.sql:/password_reset.sql:z
|
# # - ./conf/mariadb/password_reset.sql:/password_reset.sql:z
|
||||||
# - ./srv/mariadb_ln:/var/lib/mysql
|
# # - ./srv/mariadb_ln:/var/lib/mysql
|
||||||
# - ./conf/mariadb/my.cnf:/etc/my.cnf
|
# # - ./conf/mariadb/my.cnf:/etc/my.cnf
|
||||||
environment:
|
# environment:
|
||||||
- MARIADB_ROOT_PASSWORD=$$1sky.Adapting.7e2
|
# - MARIADB_ROOT_PASSWORD=$$1sky.Adapting.7e2
|
||||||
# - MARIADB_ROOT_PASSWORD=CentauriStar123
|
# # - MARIADB_ROOT_PASSWORD=CentauriStar123
|
||||||
# - MARIADB_DATABASE: 'my_env_db'
|
# # - MARIADB_DATABASE: 'my_env_db'
|
||||||
# - MYSQL_ROOT_PASSWORD=$$1sky.Adapting.7e2
|
# # - MYSQL_ROOT_PASSWORD=$$1sky.Adapting.7e2
|
||||||
# - MYSQL_ROOT_PASSWORD=CentauriStar123
|
# # - MYSQL_ROOT_PASSWORD=CentauriStar123
|
||||||
# - MYSQL_PASSWORD=MyPassword
|
# # - MYSQL_PASSWORD=MyPassword
|
||||||
# - MYSQL_DATABASE=nextcloud
|
# # - MYSQL_DATABASE=nextcloud
|
||||||
# - MYSQL_USER=nextcloud
|
# # - MYSQL_USER=nextcloud
|
||||||
|
|
||||||
# nextcloud25:
|
# nextcloud25:
|
||||||
# container_name: ae_nextcloud25_dev
|
# container_name: ae_nextcloud25_dev
|
||||||
@@ -280,38 +279,38 @@ services:
|
|||||||
stdin_open: true # docker run -i
|
stdin_open: true # docker run -i
|
||||||
tty: true # docker run -t
|
tty: true # docker run -t
|
||||||
|
|
||||||
aether_api_v5_gunicorn:
|
# aether_api_v5_gunicorn:
|
||||||
restart: always
|
# restart: always
|
||||||
container_name: ae_api_v5_dev
|
# container_name: ae_api_v5_dev
|
||||||
build:
|
# build:
|
||||||
# context: ./builds
|
# # context: ./builds
|
||||||
context: ./
|
# context: ./
|
||||||
dockerfile: aether_api_v5_fastapi_gunicorn.Dockerfile
|
# dockerfile: aether_api_v5_fastapi_gunicorn.Dockerfile
|
||||||
env_file:
|
# env_file:
|
||||||
- ./.env
|
# - ./.env
|
||||||
ports:
|
# ports:
|
||||||
- "5067:5005"
|
# - "5067:5005"
|
||||||
volumes:
|
# volumes:
|
||||||
- ./conf/aether_api_v5_fastapi_gunicorn_conf.py:/conf/gunicorn_fastapi_conf.py
|
# - ./conf/aether_api_v5_fastapi_gunicorn_conf.py:/conf/gunicorn_fastapi_conf.py
|
||||||
- ./conf/aether_api_v5_fastapi_requirements_current.txt:/conf/requirements_current.txt
|
# - ./conf/aether_api_v5_fastapi_requirements_current.txt:/conf/requirements_current.txt
|
||||||
- ./conf/aether_api_v5_fastapi_config.py:/srv/aether_api/app/config.py
|
# - ./conf/aether_api_v5_fastapi_config.py:/srv/aether_api/app/config.py
|
||||||
|
#
|
||||||
- ./logs/ae_api_v5:/logs
|
# - ./logs/ae_api_v5:/logs
|
||||||
|
#
|
||||||
- ./srv/aether_api_v5_ln:/srv/aether_api
|
# - ./srv/aether_api_v5_ln:/srv/aether_api
|
||||||
- ./srv/hosted_files_ln:/srv/hosted_files
|
# - ./srv/hosted_files_ln:/srv/hosted_files
|
||||||
- ./srv/hosted_tmp_ln:/srv/hosted_tmp
|
# - ./srv/hosted_tmp_ln:/srv/hosted_tmp
|
||||||
|
#
|
||||||
# - ./tmp/ae_api:/tmp
|
# # - ./tmp/ae_api:/tmp
|
||||||
|
#
|
||||||
- ./temp/ae_api:/temp
|
# - ./temp/ae_api:/temp
|
||||||
# - ./temp/ae_api/aether_fastapi_requirements_current.txt:/temp/requirements_current.txt
|
# # - ./temp/ae_api/aether_fastapi_requirements_current.txt:/temp/requirements_current.txt
|
||||||
# links:
|
# # links:
|
||||||
# - redis
|
# # - redis
|
||||||
depends_on:
|
# depends_on:
|
||||||
- redis
|
# - redis
|
||||||
stdin_open: true # docker run -i
|
# stdin_open: true # docker run -i
|
||||||
tty: true # docker run -t
|
# tty: true # docker run -t
|
||||||
|
|
||||||
aether_app_gunicorn:
|
aether_app_gunicorn:
|
||||||
restart: always
|
restart: always
|
||||||
|
|||||||
@@ -7,6 +7,14 @@ Create links to the actual directories as needed
|
|||||||
* ./srv/oneskyit_site
|
* ./srv/oneskyit_site
|
||||||
* ./srv/static_files
|
* ./srv/static_files
|
||||||
|
|
||||||
|
git clone https://scott_idem@bitbucket.org/oneskyit/one-sky-it-api-fastapi.git /srv/http/aether_api_fastapi/
|
||||||
|
git pull origin development
|
||||||
|
|
||||||
|
git clone https://scott_idem@bitbucket.org/oneskyit/one-sky-it-app.git /srv/http/aether_app/
|
||||||
|
git pull origin development
|
||||||
|
|
||||||
|
git status
|
||||||
|
|
||||||
## Create links examples
|
## Create links examples
|
||||||
### Flask App
|
### Flask App
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
Reference in New Issue
Block a user