From f6c070a3cb36c5593123b27b4d1b6a5b7a10aba3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 3 Apr 2021 04:23:31 +0200 Subject: [PATCH 1/6] removed config warning cleaned up test.yml workflow try to run without .env files --- .github/workflows/test.yml | 19 ++++++++----------- backend/src/config/index.js | 5 ++--- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 276589dc0..5a8bb153c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -194,11 +194,10 @@ jobs: ########################################################################## # UNIT TESTS BACKEND ##################################################### ########################################################################## - # TODO: Why do we need those .envs? - - name: backend | copy env files webapp - run: cp webapp/.env.template webapp/.env - - name: backend | copy env files backend - run: cp backend/.env.template backend/.env + #- name: backend | copy env files webapp + # run: cp webapp/.env.template webapp/.env + #- name: backend | copy env files backend + # run: cp backend/.env.template backend/.env - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend - name: backend | Initialize Database @@ -232,13 +231,11 @@ jobs: ########################################################################## # UNIT TESTS WEBAPP ##################################################### ########################################################################## - # TODO: Why do we need those .envs? - - name: backend | copy env files webapp - run: cp webapp/.env.template webapp/.env - - name: backend | copy env files backend - run: cp backend/.env.template backend/.env + #- name: backend | copy env files webapp + # run: cp webapp/.env.template webapp/.env + #- name: backend | copy env files backend + # run: cp backend/.env.template backend/.env - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp - name: webapp | Unit tests - #run: docker run --rm ocelotsocialnetwork/webapp:build yarn run test run: docker-compose exec -T webapp yarn test \ No newline at end of file diff --git a/backend/src/config/index.js b/backend/src/config/index.js index b7d500b8b..3eb69153a 100644 --- a/backend/src/config/index.js +++ b/backend/src/config/index.js @@ -7,9 +7,8 @@ if (require.resolve) { try { dotenv.config({ path: require.resolve('../../.env') }) } catch (error) { - if (error.code === 'MODULE_NOT_FOUND') { - console.log('WARN: No `.env` file found in `/app` (docker) or `/backend` (no docker)') // eslint-disable-line no-console - } else { + // This error is thrown when the .env is not found + if (error.code !== 'MODULE_NOT_FOUND') { throw error } } From 742543b87a23252ca66ce36e7e868449ef4f61aa Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 3 Apr 2021 04:34:14 +0200 Subject: [PATCH 2/6] try without .env file in production composer file --- docker-compose.override.yml | 4 ++++ docker-compose.yml | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 8d1bb96f2..d04249e8d 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -12,6 +12,8 @@ services: - NODE_ENV="development" # - DEBUG=true - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/` + env_file: + - ./webapp/.env volumes: # This makes sure the docker container has its own node modules. # Therefore it is possible to have a different node version on the host machine @@ -29,6 +31,8 @@ services: environment: - NODE_ENV="development" - DEBUG=true + env_file: + - ./backend/.env volumes: # This makes sure the docker container has its own node modules. # Therefore it is possible to have a different node version on the host machine diff --git a/docker-compose.yml b/docker-compose.yml index 392447f61..2dc4f3c45 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,8 +33,6 @@ services: # Application only envs - HOST=0.0.0.0 # This is nuxt specific, alternative value is HOST=webapp - GRAPHQL_URI=http://backend:4000 - env_file: - - ./webapp/.env ######################################################## # BACKEND ############################################## @@ -66,8 +64,6 @@ services: - NEO4J_URI=bolt://neo4j:7687 - GRAPHQL_URI=http://backend:4000 - CLIENT_URI=http://webapp:3000 - env_file: - - ./backend/.env ######################################################## # NEO4J ################################################ From ee4a63b606a052d53c8ebc29c66faeb81f81635c Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 3 Apr 2021 05:01:55 +0200 Subject: [PATCH 3/6] define envs for the backend in test compose file --- docker-compose.test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 2d382d606..6f29c9539 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -20,6 +20,9 @@ services: target: test environment: - NODE_ENV="test" + - JWT_SECRET="b/&&7b78BF&fv/Vd" + - MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g" + - PRIVATE_KEY_PASSPHRASE="a7dsf78sadg87ad87sfagsadg78" ######################################################## # NEO4J ################################################ From dfe6f679b3bb0f440aee986d6d12925cccee9050 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 3 Apr 2021 05:17:13 +0200 Subject: [PATCH 4/6] include env files in build process --- .github/workflows/test.yml | 16 ++++++++-------- docker-compose.test.yml | 3 --- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5a8bb153c..a84d32c2d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -194,10 +194,10 @@ jobs: ########################################################################## # UNIT TESTS BACKEND ##################################################### ########################################################################## - #- name: backend | copy env files webapp - # run: cp webapp/.env.template webapp/.env - #- name: backend | copy env files backend - # run: cp backend/.env.template backend/.env + - name: backend | copy env files webapp + run: cp webapp/.env.template webapp/.env + - name: backend | copy env files backend + run: cp backend/.env.template backend/.env - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend - name: backend | Initialize Database @@ -231,10 +231,10 @@ jobs: ########################################################################## # UNIT TESTS WEBAPP ##################################################### ########################################################################## - #- name: backend | copy env files webapp - # run: cp webapp/.env.template webapp/.env - #- name: backend | copy env files backend - # run: cp backend/.env.template backend/.env + - name: backend | copy env files webapp + run: cp webapp/.env.template webapp/.env + - name: backend | copy env files backend + run: cp backend/.env.template backend/.env - name: backend | docker-compose run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp - name: webapp | Unit tests diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 6f29c9539..2d382d606 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -20,9 +20,6 @@ services: target: test environment: - NODE_ENV="test" - - JWT_SECRET="b/&&7b78BF&fv/Vd" - - MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g" - - PRIVATE_KEY_PASSPHRASE="a7dsf78sadg87ad87sfagsadg78" ######################################################## # NEO4J ################################################ From c418cb1b505f3d066860dfe9e40f2c5bea816c4e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 3 Apr 2021 05:25:59 +0200 Subject: [PATCH 5/6] include env file loading in test compose file --- docker-compose.test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 2d382d606..6faba6150 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -10,6 +10,8 @@ services: target: test environment: - NODE_ENV="test" + env_file: + - ./webapp/.env ######################################################## # BACKEND ############################################## @@ -20,6 +22,8 @@ services: target: test environment: - NODE_ENV="test" + env_file: + - ./backend/.env ######################################################## # NEO4J ################################################ From d40704dcb69297362f5cc664588cd9b98df7476a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 3 Apr 2021 05:41:58 +0200 Subject: [PATCH 6/6] .env is required no way around it --- .github/workflows/test.yml | 2 +- docker-compose.override.yml | 4 ---- docker-compose.test.yml | 4 ---- docker-compose.yml | 4 ++++ 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a84d32c2d..1bca06b08 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -229,7 +229,7 @@ jobs: - name: Load Docker Image run: docker load < /tmp/webapp.tar ########################################################################## - # UNIT TESTS WEBAPP ##################################################### + # UNIT TESTS WEBAPP ###################################################### ########################################################################## - name: backend | copy env files webapp run: cp webapp/.env.template webapp/.env diff --git a/docker-compose.override.yml b/docker-compose.override.yml index d04249e8d..8d1bb96f2 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -12,8 +12,6 @@ services: - NODE_ENV="development" # - DEBUG=true - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/` - env_file: - - ./webapp/.env volumes: # This makes sure the docker container has its own node modules. # Therefore it is possible to have a different node version on the host machine @@ -31,8 +29,6 @@ services: environment: - NODE_ENV="development" - DEBUG=true - env_file: - - ./backend/.env volumes: # This makes sure the docker container has its own node modules. # Therefore it is possible to have a different node version on the host machine diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 6faba6150..2d382d606 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -10,8 +10,6 @@ services: target: test environment: - NODE_ENV="test" - env_file: - - ./webapp/.env ######################################################## # BACKEND ############################################## @@ -22,8 +20,6 @@ services: target: test environment: - NODE_ENV="test" - env_file: - - ./backend/.env ######################################################## # NEO4J ################################################ diff --git a/docker-compose.yml b/docker-compose.yml index 2dc4f3c45..392447f61 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,6 +33,8 @@ services: # Application only envs - HOST=0.0.0.0 # This is nuxt specific, alternative value is HOST=webapp - GRAPHQL_URI=http://backend:4000 + env_file: + - ./webapp/.env ######################################################## # BACKEND ############################################## @@ -64,6 +66,8 @@ services: - NEO4J_URI=bolt://neo4j:7687 - GRAPHQL_URI=http://backend:4000 - CLIENT_URI=http://webapp:3000 + env_file: + - ./backend/.env ######################################################## # NEO4J ################################################