From 243bdb24cb8d570c962195adffe43f346773e360 Mon Sep 17 00:00:00 2001 From: Matias Date: Thu, 4 Jul 2019 19:20:48 -0300 Subject: [PATCH] ESM Modules and service dependency fix --- docker-compose.linux.yml | 87 +++++++++------------------ docker-compose.win.yml | 87 +++++++++------------------ docker-compose.yml | 107 +++++++++++++++------------------ env/teams-api.env | 2 +- env_linux/teams-api.env | 2 +- server/docker-compose.prod.yml | 2 +- 6 files changed, 110 insertions(+), 177 deletions(-) diff --git a/docker-compose.linux.yml b/docker-compose.linux.yml index a4710890f..fe119a6ef 100644 --- a/docker-compose.linux.yml +++ b/docker-compose.linux.yml @@ -1,19 +1,6 @@ version: "3" services: - minio: - image: minio/minio:RELEASE.2019-05-23T00-29-34Z - volumes: - - '/home/saadmin/data:/data' - ports: - - "9000:9000" - environment: - MINIO_ACCESS_KEY: minio - MINIO_SECRET_KEY: minio123 - command: server /data - networks: - - superalgos_net - postgres: image: postgres:11-alpine restart: always @@ -26,6 +13,17 @@ services: networks: - superalgos_net + minio: + image: minio/minio:RELEASE.2019-06-27T21-13-50Z + volumes: + - minio_data:/data + environment: + MINIO_ACCESS_KEY: minio + MINIO_SECRET_KEY: minio123 + command: server /data + networks: + - superalgos_net + prisma: image: prismagraphql/prisma:1.27 restart: always @@ -42,8 +40,6 @@ services: user: prisma password: prisma migrations: true - ports: - - "4466:4466" volumes: - postgresdb_data:/data/db networks: @@ -51,23 +47,31 @@ services: depends_on: - postgres - teams-prisma: + teams-deploy: image: superalgos/teams-prisma:0.1.0 restart: "no" env_file: ./env/teams-prisma.env - command: ["./wait-for-it.sh", "prisma:4466", "--", "prisma", "deploy"] + command: sh -c './wait-for prisma:4466 -- prisma deploy' networks: - superalgos_net depends_on: - prisma + teams-api: + image: superalgos/teams-api:0.1.0 + restart: always + env_file: ./env/teams-api.env + command: sh -c './wait-for prisma:4466 -- node .' + networks: + - superalgos_net + depends_on: + - teams-deploy + mongo: image: mongo:4.0.9 restart: always volumes: - mongodb_data:/data/db - ports: - - "27017:27017" networks: - superalgos_net @@ -86,8 +90,6 @@ services: restart: always env_file: ./env/saweb-api.env command: node . - ports: - - "4004:4004" networks: - superalgos_net depends_on: @@ -97,7 +99,7 @@ services: image: superalgos/logs-api:0.1.0 restart: always env_file: ./env/logs-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: @@ -107,7 +109,7 @@ services: image: superalgos/clones-api:0.1.0 restart: always env_file: ./env/clones-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: @@ -117,7 +119,7 @@ services: image: superalgos/cockpit-api:0.1.0 restart: always env_file: ./env/cockpit-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: @@ -137,7 +139,7 @@ services: image: superalgos/events-api:0.1.0 restart: always env_file: ./env/events-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: @@ -148,8 +150,6 @@ services: restart: always env_file: ./env/users-api.env command: node . - ports: - - "4000:4000" networks: - superalgos_net depends_on: @@ -159,29 +159,17 @@ services: image: superalgos/keyvault-api:0.1.0 restart: always env_file: ./env/keyvault-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: - mongo-express - teams-api: - image: superalgos/teams-api:0.1.0 - restart: always - env_file: ./env/teams-api.env - command: npm start - ports: - - "4001:4001" - networks: - - superalgos_net - depends_on: - - prisma - notifications-api: image: superalgos/notifications-api:0.1.0 restart: always env_file: ./env/notifications-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: @@ -196,29 +184,16 @@ services: - "3100:3100" networks: - superalgos_net - depends_on: - - keyvault-api - - clones-api - - users-api - - events-api - - strategizer-api - - logs-api - - cockpit-api - - teams-api - - notifications-api - - saweb-api master-app-api: image: superalgos/master-app-api:0.1.0 restart: always env_file: ./env/master-app-api.env - command: node . + command: sh -c './wait-for users-api:4000 -- ./wait-for teams-api:4001 -- ./wait-for keyvault-api:4002 -- ./wait-for clones-api:4003 -- ./wait-for saweb-api:4004 -- ./wait-for events-api:4005 -- ./wait-for notifications-api:4006 -- ./wait-for logs-api:4007 -- ./wait-for strategizer-api:4008 -- ./wait-for cockpit-api:4009 -- node .' ports: - "4100:4100" networks: - superalgos_net - depends_on: - - master-app aaweb: image: superalgos/aaweb:0.1.0 @@ -229,8 +204,6 @@ services: - "4101:4101" networks: - superalgos_net - depends_on: - - master-app-api kubernetes: image: qoomon/docker-host:2.2.0 diff --git a/docker-compose.win.yml b/docker-compose.win.yml index 02bd7aa3e..49d60a546 100644 --- a/docker-compose.win.yml +++ b/docker-compose.win.yml @@ -1,19 +1,6 @@ version: "3" services: - minio: - image: minio/minio:RELEASE.2019-05-23T00-29-34Z - volumes: - - 'C:\superalgos:/data' - ports: - - "9000:9000" - environment: - MINIO_ACCESS_KEY: minio - MINIO_SECRET_KEY: minio123 - command: server /data - networks: - - superalgos_net - postgres: image: postgres:11-alpine restart: always @@ -26,6 +13,17 @@ services: networks: - superalgos_net + minio: + image: minio/minio:RELEASE.2019-06-27T21-13-50Z + volumes: + - 'C:\superalgos:/data' + environment: + MINIO_ACCESS_KEY: minio + MINIO_SECRET_KEY: minio123 + command: server /data + networks: + - superalgos_net + prisma: image: prismagraphql/prisma:1.27 restart: always @@ -42,8 +40,6 @@ services: user: prisma password: prisma migrations: true - ports: - - "4466:4466" volumes: - postgresdb_data:/data/db networks: @@ -51,23 +47,31 @@ services: depends_on: - postgres - teams-prisma: + teams-deploy: image: superalgos/teams-prisma:0.1.0 restart: "no" env_file: ./env/teams-prisma.env - command: ["./wait-for-it.sh", "prisma:4466", "--", "prisma", "deploy"] + command: sh -c './wait-for prisma:4466 -- prisma deploy' networks: - superalgos_net depends_on: - prisma + teams-api: + image: superalgos/teams-api:0.1.0 + restart: always + env_file: ./env/teams-api.env + command: sh -c './wait-for prisma:4466 -- node .' + networks: + - superalgos_net + depends_on: + - teams-deploy + mongo: image: mongo:4.0.9 restart: always volumes: - mongodb_data:/data/db - ports: - - "27017:27017" networks: - superalgos_net @@ -86,8 +90,6 @@ services: restart: always env_file: ./env/saweb-api.env command: node . - ports: - - "4004:4004" networks: - superalgos_net depends_on: @@ -97,7 +99,7 @@ services: image: superalgos/logs-api:0.1.0 restart: always env_file: ./env/logs-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: @@ -107,7 +109,7 @@ services: image: superalgos/clones-api:0.1.0 restart: always env_file: ./env/clones-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: @@ -117,7 +119,7 @@ services: image: superalgos/cockpit-api:0.1.0 restart: always env_file: ./env/cockpit-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: @@ -137,7 +139,7 @@ services: image: superalgos/events-api:0.1.0 restart: always env_file: ./env/events-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: @@ -148,8 +150,6 @@ services: restart: always env_file: ./env/users-api.env command: node . - ports: - - "4000:4000" networks: - superalgos_net depends_on: @@ -159,29 +159,17 @@ services: image: superalgos/keyvault-api:0.1.0 restart: always env_file: ./env/keyvault-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: - mongo-express - teams-api: - image: superalgos/teams-api:0.1.0 - restart: always - env_file: ./env/teams-api.env - command: npm start - ports: - - "4001:4001" - networks: - - superalgos_net - depends_on: - - prisma - notifications-api: image: superalgos/notifications-api:0.1.0 restart: always env_file: ./env/notifications-api.env - command: npm start + command: node . networks: - superalgos_net depends_on: @@ -196,29 +184,16 @@ services: - "3100:3100" networks: - superalgos_net - depends_on: - - keyvault-api - - clones-api - - users-api - - events-api - - strategizer-api - - logs-api - - cockpit-api - - teams-api - - notifications-api - - saweb-api master-app-api: image: superalgos/master-app-api:0.1.0 restart: always env_file: ./env/master-app-api.env - command: node . + command: sh -c './wait-for users-api:4000 -- ./wait-for teams-api:4001 -- ./wait-for keyvault-api:4002 -- ./wait-for clones-api:4003 -- ./wait-for saweb-api:4004 -- ./wait-for events-api:4005 -- ./wait-for notifications-api:4006 -- ./wait-for logs-api:4007 -- ./wait-for strategizer-api:4008 -- ./wait-for cockpit-api:4009 -- node .' ports: - "4100:4100" networks: - superalgos_net - depends_on: - - master-app aaweb: image: superalgos/aaweb:0.1.0 @@ -229,8 +204,6 @@ services: - "4101:4101" networks: - superalgos_net - depends_on: - - master-app-api kubernetes: image: qoomon/docker-host:2.2.0 diff --git a/docker-compose.yml b/docker-compose.yml index ca7c17275..65246f873 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,19 +1,6 @@ version: "3" services: - minio: - image: minio/minio:RELEASE.2019-05-23T00-29-34Z - volumes: - - 'D:\data:/data' - ports: - - "9000:9000" - environment: - MINIO_ACCESS_KEY: minio - MINIO_SECRET_KEY: minio123 - command: server /data - networks: - - superalgos_net - postgres: image: postgres:11-alpine restart: always @@ -26,6 +13,19 @@ services: networks: - superalgos_net + minio: + image: minio/minio:RELEASE.2019-06-27T21-13-50Z + volumes: + - 'D:\data:/data' + ports: + - "9000:9000" + environment: + MINIO_ACCESS_KEY: minio + MINIO_SECRET_KEY: minio123 + command: server /data + networks: + - superalgos_net + prisma: image: prismagraphql/prisma:1.27 restart: always @@ -51,17 +51,30 @@ services: depends_on: - postgres - teams-prisma: + teams-deploy: image: superalgos/teams-prisma:0.1.0 restart: "no" build: ../TeamsPrisma env_file: ./env/teams-prisma.env - command: ["./wait-for-it.sh", "prisma:4466", "--", "prisma", "deploy"] + command: sh -c './wait-for prisma:4466 -- prisma deploy' networks: - superalgos_net depends_on: - prisma + teams-api: + image: superalgos/teams-api:0.1.0 + restart: always + build: ../TeamsModule/api + env_file: ./env/teams-api.env + command: sh -c './wait-for prisma:4466 -- node .' + ports: + - "4001:4001" + networks: + - superalgos_net + depends_on: + - teams-deploy + mongo: image: mongo:4.0.9 restart: always @@ -82,19 +95,6 @@ services: depends_on: - mongo - clones-api: - image: superalgos/clones-api:0.1.0 - restart: always - build: ../OperationsModule/server - env_file: ./env/clones-api.env - command: npm start - ports: - - "4003:4003" - networks: - - superalgos_net - depends_on: - - mongo-express - saweb-api: image: superalgos/saweb-api:0.1.0 restart: always @@ -113,7 +113,7 @@ services: restart: always build: ../LogsServerModule env_file: ./env/logs-api.env - command: npm start + command: node . ports: - "4007:4007" networks: @@ -121,12 +121,25 @@ services: depends_on: - mongo-express + clones-api: + image: superalgos/clones-api:0.1.0 + restart: always + build: ../OperationsModule/server + env_file: ./env/clones-api.env + command: node . + ports: + - "4003:4003" + networks: + - superalgos_net + depends_on: + - mongo-express + cockpit-api: image: superalgos/cockpit-api:0.1.0 restart: always build: ../CockpitServerModule env_file: ./env/cockpit-api.env - command: npm start + command: node . ports: - "4009:4009" networks: @@ -152,7 +165,7 @@ services: restart: always build: ../EventsServerModule env_file: ./env/events-api.env - command: npm start + command: node . ports: - "4005:4005" networks: @@ -178,7 +191,7 @@ services: restart: always build: ../KeyVaultModule/server env_file: ./env/keyvault-api.env - command: npm start + command: node . ports: - "4002:4002" networks: @@ -186,25 +199,12 @@ services: depends_on: - mongo-express - teams-api: - image: superalgos/teams-api:0.1.0 - restart: always - build: ../TeamsModule/api - env_file: ./env/teams-api.env - command: npm start - ports: - - "4001:4001" - networks: - - superalgos_net - depends_on: - - prisma - notifications-api: image: superalgos/notifications-api:0.1.0 restart: always build: ../NotificationsModule/server env_file: ./env/notifications-api.env - command: npm start + command: node . ports: - "4006:4006" networks: @@ -222,30 +222,17 @@ services: - "3100:3100" networks: - superalgos_net - depends_on: - - keyvault-api - - clones-api - - users-api - - events-api - - strategizer-api - - logs-api - - cockpit-api - - teams-api - - notifications-api - - saweb-api master-app-api: image: superalgos/master-app-api:0.1.0 restart: always build: ./server env_file: ./env/master-app-api.env - command: sh -c './wait-for master-app:3100 -- node .' + command: sh -c './wait-for users-api:4000 -- ./wait-for teams-api:4001 -- ./wait-for keyvault-api:4002 -- ./wait-for clones-api:4003 -- ./wait-for saweb-api:4004 -- ./wait-for events-api:4005 -- ./wait-for notifications-api:4006 -- ./wait-for logs-api:4007 -- ./wait-for strategizer-api:4008 -- ./wait-for cockpit-api:4009 -- node .' ports: - "4100:4100" networks: - superalgos_net - depends_on: - - master-app aaweb: image: superalgos/aaweb:0.1.0 diff --git a/env/teams-api.env b/env/teams-api.env index 2b1926b91..b3e6ad7b5 100644 --- a/env/teams-api.env +++ b/env/teams-api.env @@ -7,7 +7,7 @@ PRISMA_SECRET=prisma_secret PRISMA_ENDPOINT=http://prisma:4466 GENERATE_SOURCEMAP=true -SCHEMA_PATH=dist/generated/prisma.graphql +SCHEMA_PATH=src/generated/prisma.graphql PLATFORM_API_URL=http://master-app-api:4100/graphql diff --git a/env_linux/teams-api.env b/env_linux/teams-api.env index 2b1926b91..b3e6ad7b5 100644 --- a/env_linux/teams-api.env +++ b/env_linux/teams-api.env @@ -7,7 +7,7 @@ PRISMA_SECRET=prisma_secret PRISMA_ENDPOINT=http://prisma:4466 GENERATE_SOURCEMAP=true -SCHEMA_PATH=dist/generated/prisma.graphql +SCHEMA_PATH=src/generated/prisma.graphql PLATFORM_API_URL=http://master-app-api:4100/graphql diff --git a/server/docker-compose.prod.yml b/server/docker-compose.prod.yml index b5c41cfbc..022f14032 100644 --- a/server/docker-compose.prod.yml +++ b/server/docker-compose.prod.yml @@ -14,7 +14,7 @@ services: - /var/www/app/node_modules working_dir: /var/www/app restart: always - command: npm start + command: node . expose: - 4100 network_mode: webproxy