diff --git a/docker-compose.yml b/docker-compose.yml index 9c34993..1b395fd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,8 @@ version: "3.7" # Service Definitions services: - db: - image: "amineo/t2-stats-db:v0.1.4" + image: "amineo/t2-stats-db:v0.2.0" build: context: . dockerfile: ./build/postgres/Dockerfile @@ -22,19 +21,18 @@ services: mode: replicated replicas: 1 placement: - constraints: [node.role == manager] - + constraints: [node.role == manager] parser: - image: "amineo/t2-stats-parser:v0.1.4" + image: "amineo/t2-stats-parser:v0.2.0" build: context: . dockerfile: ./build/go-t2-stat-parser/Dockerfile - environment: + environment: DATABASE_URL: "postgres://${POSTGRES_USER}:{POSTGRES_PASSWORD}@db:5432/t2_stats" FTP_HOST: "${FTP_HOST}" FTP_USER: "${FTP_USER}" - FTP_PW: "${FTP_PW}" + FTP_PW: "${FTP_PW}" depends_on: - db networks: @@ -45,18 +43,17 @@ services: mode: replicated replicas: 1 - web: - image: "amineo/t2-stats-web:v0.1.0-rc5" + image: "amineo/t2-stats-web:v0.1.0-rc6" build: context: . dockerfile: ./build/webapp/Dockerfile environment: - NODE_ENV: "production" # set as default in image - CACHE_VIEWS: "true" # set as default in image - APP_NAME: "Web" # set as default in image + NODE_ENV: "production" # set as default in image + CACHE_VIEWS: "true" # set as default in image + APP_NAME: "Web" # set as default in image -# APP_KEY: "You-need-to-generate-this (npx adonis key:generate --echo)" + # APP_KEY: "You-need-to-generate-this (npx adonis key:generate --echo)" APP_KEY_FILE: /run/secrets/adonis.appkey DB_HOST: "db" @@ -80,9 +77,9 @@ services: # api: # image: "node:12-alpine" - # depends_on: + # depends_on: # - db - # networks: + # networks: # - internal # - external # deploy: @@ -91,18 +88,14 @@ services: # mode: replicated # replicas: 1 - - volumes: psqldata: - networks: external: internal: - secrets: adonis.appkey: external: true - name: adonis.appkey.v1 \ No newline at end of file + name: adonis.appkey.v1