diff --git a/.env b/.env index 4b89516..009670c 100644 --- a/.env +++ b/.env @@ -1,20 +1,6 @@ # Naliia NALIIA_IMAGE=gitea.onecluster.org/aserrador/naliia:latest -# TRYTOND information -TRYTOND_VERSION=7.6 -TRYTON_PORT=8000 -TRYTON_ADMIN_EMAIL=admin@admin.co -TRYTONPASSFILE=/etc/trytond_admin_pass.conf - -DB_HOSTNAME="db" -POSTGRES_DB="naliia" -POSTGRES_USER="postgres" -POSTGRES_PASSWORD="SUp3r-pass*DB" - -# EMAIL -EMAIL="admin@admin.org" - # SMTP SMTP="True" SMTP_TYPE="smtps+ssl" @@ -24,8 +10,3 @@ SMTP_DOMAIN="domain.com" SMTP_PORT=465 SMTP_FROM="Company CO" SMTP_EMAIL="domain@domain.com" - -# NGINX -SERVER_NAME="tryton.domain.com" -NGINX_PORT=10000 -VARIABLE=$ diff --git a/docker-compose.yaml b/docker-compose.yaml index 54750f1..8705bb0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -22,7 +22,9 @@ services: - var:/var - attachment:/mnt/attachment environment: - - TRYTOND_DATABASE_URI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOSTNAME}:5432/ + - TRYTOND_DATABASE_URI: ${TRYTOND_DATABASE_URI:-postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOSTNAME}:5432/} + - NALIIA_IMAGE: ${NALIIA_IMAGE:-gitea.onecluster.org/aserrador/naliia:latest} + - EMAIL: ${EMAIL:-admin@admin.org} depends_on: db: condition: service_healthy @@ -44,7 +46,7 @@ services: volumes: - .:/app environment: - - TRYTOND_DATABASE_URI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOSTNAME}:5432/ + - TRYTOND_DATABASE_URI: ${TRYTOND_DATABASE_URI:-postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOSTNAME}:5432/} env_file: - .env cron: @@ -57,7 +59,7 @@ services: volumes: - .:/app environment: - - TRYTOND_DATABASE_URI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOSTNAME}:5432/ + - TRYTOND_DATABASE_URI: ${TRYTOND_DATABASE_URI:-postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${DB_HOSTNAME}:5432/} env_file: - .env volumes: