feat: Add .env

docker-compose.yaml

@@ -8,12 +8,13 @@ services:
       POSTGRES_DB: ${POSTGRES_DB:-naliia}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-SUp3r-pass*DB}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-naliia}"]
       interval: 10s
       timeout: 5s
       retries: 5
     env_file:
       - .env
+
   tryton:
     image: ${NALIIA_IMAGE}
     working_dir: /app
@@ -22,9 +23,11 @@ services:
       - var:/var
       - attachment:/mnt/attachment
     environment:
-      TRYTOND_DATABASE_URI: ${TRYTOND_DATABASE_URI:-postgresql://postgres:SUp3r-pass*DB@db:5432/}
+      TRYTOND_DATABASE_URI: ${TRYTOND_DATABASE_URI:-postgresql://${POSTGRES_USER:-naliia}:${POSTGRES_PASSWORD:-SUp3r-pass*DB}@${DB_HOSTNAME:-db}:5432/}
       NALIIA_IMAGE: ${NALIIA_IMAGE:-gitea.onecluster.org/aserrador/naliia:latest}
       EMAIL: ${EMAIL:-admin@admin.org}
+    ports:
+      - "${TRYTON_PORT:-8000}:8000"
     depends_on:
       db:
         condition: service_healthy
@@ -36,32 +39,39 @@ services:
       timeout: 20s
     env_file:
       - .env
+
   worker:
     image: ${NALIIA_IMAGE}
     working_dir: /app
     depends_on:
      tryton:
        condition: service_healthy
+     db:
+       condition: service_healthy
     entrypoint: [ "bash", "-c", "/entrypoint.sh trytond-worker -c /etc/trytond_worker.conf -d ${POSTGRES_DB} --logconf /etc/trytond_worker_logging.conf"]
     volumes:
       - .:/app
     environment:
-      TRYTOND_DATABASE_URI: ${TRYTOND_DATABASE_URI:-postgresql://postgres:SUp3r-pass*DB@db:5432/}
+      TRYTOND_DATABASE_URI: ${TRYTOND_DATABASE_URI:-postgresql://${POSTGRES_USER:-naliia}:${POSTGRES_PASSWORD:-SUp3r-pass*DB}@${DB_HOSTNAME:-db}:5432/}
     env_file:
       - .env
+
   cron:
     image: ${NALIIA_IMAGE}
     working_dir: /app
     depends_on:
       tryton:
        condition: service_healthy
+      db:
+       condition: service_healthy
     entrypoint: [ "bash", "-c", "/entrypoint.sh trytond-cron -c /etc/trytond.conf -d ${POSTGRES_DB} --logconf /etc/trytond_cron_logging.conf"]
     volumes:
      - .:/app
     environment:
-      TRYTOND_DATABASE_URI: ${TRYTOND_DATABASE_URI:-postgresql://postgres:SUp3r-pass*DB@db:5432/}
+      TRYTOND_DATABASE_URI: ${TRYTOND_DATABASE_URI:-postgresql://${POSTGRES_USER:-naliia}:${POSTGRES_PASSWORD:-SUp3r-pass*DB}@${DB_HOSTNAME:-db}:5432/}
     env_file:
      - .env
+
 volumes:
   postgres:
   var: