Explorar el Código

changes to Docker Compose files

main
Simon Bowie hace 3 semanas
padre
commit
ebad99eca3
Se han modificado 3 ficheros con 8 adiciones y 6 borrados
  1. +4
    -2
      database_functions.sh
  2. +2
    -2
      docker-compose.nginx.yml
  3. +2
    -2
      docker-compose.no-nginx.yml

+ 4
- 2
database_functions.sh Ver fichero

@@ -11,6 +11,7 @@
############################################################
# subprograms #
############################################################

License()
{
echo 'Copyright 2022-2025 Simon Bowie <simonxix@simonxix.com>'
@@ -27,7 +28,7 @@ Help()
# Display Help
echo "This script performs database functions for the Experimental Publishing Compendium"
echo
echo "Syntax: database_functions.sh [-l|h|e|i|c|v|d]"
echo "Syntax: database_functions.sh [-l|h|e|i|c|v|d|b]"
echo "options:"
echo "l Print the MIT License notification."
echo "h Print this Help."
@@ -73,6 +74,7 @@ Backup()

scp $EXPORT_DIRECTORY/$BACKUP_SQL_FILENAME.sql $STORAGE_USERNAME@$STORAGE_SERVER:$STORAGE_DIRECTORY
}

############################################################
############################################################
# main program #
@@ -148,7 +150,7 @@ while getopts ":hleicvdb" flag; do
b) # backup database to secure storage
Backup
exit;;
\?) # Invalid option
\?) # invalid option
Help
exit;;
esac

docker-compose.prod.yml → docker-compose.nginx.yml Ver fichero

@@ -8,7 +8,7 @@ services:
volumes:
- ./web:/code
env_file:
- ./.env.prod
- ./.env.nginx
depends_on:
- db
command: gunicorn --workers=3 --bind 0.0.0.0:5000 "app:create_app()"
@@ -18,7 +18,7 @@ services:
container_name: mariadb
restart: unless-stopped
env_file:
- ./.env.prod
- ./.env.nginx
volumes:
- dbdata:/var/lib/mysql
command: '--default-authentication-plugin=mysql_native_password'

docker-compose.yml → docker-compose.no-nginx.yml Ver fichero

@@ -8,7 +8,7 @@ services:
volumes:
- ./web:/code
env_file:
- ./.env.dev
- ./.env
depends_on:
- db
@@ -17,7 +17,7 @@ services:
container_name: mariadb
restart: unless-stopped
env_file:
- ./.env.dev
- ./.env
volumes:
- dbdata:/var/lib/mysql
command: '--default-authentication-plugin=mysql_native_password'

Cargando…
Cancelar
Guardar