diff --git a/docker-compose.coolify.yml b/docker-compose.coolify.yml index 1c03d6e..76789cd 100644 --- a/docker-compose.coolify.yml +++ b/docker-compose.coolify.yml @@ -43,6 +43,7 @@ services: ports: - "8000" restart: unless-stopped + casdoor: container_name: procurement-casdoor depends_on: @@ -51,8 +52,7 @@ services: required: true environment: RUNNING_IN_DOCKER: "true" - dataSourceName: user=casdoor password=casdoor host=postgres port=5432 sslmode=disable - dbname=casdoor + dataSourceName: "user=postgres password=postgres host=postgres port=5432 sslmode=disable dbname=casdoor" dbName: casdoor driverName: postgres origin: https://${AUTH_HOST} @@ -73,6 +73,7 @@ services: ports: - "8081:8000" restart: unless-stopped + frontend: build: context: ./frontend @@ -98,6 +99,7 @@ services: default: null traefik_network: null restart: unless-stopped + minio: command: - server @@ -138,6 +140,7 @@ services: restart: unless-stopped volumes: - minio_data:/data + minio-init: container_name: procurement-minio-init depends_on: @@ -147,9 +150,13 @@ services: entrypoint: - /bin/sh - -c - - " until mc alias set local http://$${MINIO_ENDPOINT} $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD}; - do\n echo 'waiting for minio server...'; sleep 2;\ndone; mc mb --ignore-existing - local/$${MINIO_BUCKET}; echo bucket $${MINIO_BUCKET} ready; " + - | + until mc alias set local http://$${MINIO_ENDPOINT} $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD}; do + echo 'waiting for minio server...'; + sleep 2; + done; + mc mb --ignore-existing local/$${MINIO_BUCKET}; + echo bucket $${MINIO_BUCKET} ready; environment: MINIO_BUCKET: procurement-files MINIO_ENDPOINT: minio:9000 @@ -159,6 +166,7 @@ services: networks: default: null restart: 'no' + postgres: container_name: procurement-postgres environment: @@ -182,6 +190,7 @@ services: - postgres_data:/var/lib/postgresql - ./sql/migration.sql:/docker-entrypoint-initdb.d/01-migration.sql:ro - ./sql/02-casdoor-db.sql:/docker-entrypoint-initdb.d/02-casdoor-db.sql:ro + traefik: command: - --providers.docker=true @@ -209,16 +218,18 @@ services: - /var/run/docker.sock:/var/run/docker.sock - ./infra/traefik-dynamic.yml:/etc/traefik/dynamic.yml:ro - traefik_certs:/certs + networks: default: name: v15_default traefik_network: name: traefik_network driver: bridge + volumes: minio_data: name: v15_minio_data postgres_data: name: v15_postgres_data traefik_certs: - name: v15_traefik_certs + name: v15_traefik_certs \ No newline at end of file