From f03577358d34dd2deb5f26693dc0bb89b2bc321a Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 17 Dec 2019 22:05:37 +0200 Subject: [PATCH] Some API_URL ethnic cleansing --- .deploy_dev.sh | 2 +- .gitlab-ci.yml | 2 +- package.json | 4 ++-- stack-compose.yml | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.deploy_dev.sh b/.deploy_dev.sh index e9d1c6f..5419642 100644 --- a/.deploy_dev.sh +++ b/.deploy_dev.sh @@ -8,7 +8,7 @@ pushd deployment-frontend docker-compose down docker pull "$1" -API_URL=http://web.sik.party:8000/api docker-compose up -d frontend +docker-compose up -d frontend popd diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8751a51..39b3fd2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ ts:build: only: - master script: - - API_URL=http://web.sik.party:8000 npm run build + - API_URL=http://web.sik.party:8000/api npm run build prod:build: image: node:12 diff --git a/package.json b/package.json index 3f6574c..e3c8c79 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,8 @@ "start-prod": "npm run build && npm run serve", "mock-backend": "json-server --watch db.json -H 0.0.0.0 -p 1234", "test": "npm run test:e2e:verbose", - "test:e2e": "API_URL=http://web.sik.party:8000/api npm-run-all -p -r serve test:e2e:testcafe", - "test:e2e:verbose": "API_URL=http://web.sik.party:8000/api npm-run-all -p -r serve test:e2e:testcafe:verbose", + "test:e2e": "npm-run-all -p -r serve test:e2e:testcafe", + "test:e2e:verbose": "npm-run-all -p -r serve test:e2e:testcafe:verbose", "test:e2e:testcafe": "testcafe -S -s 'tests/testcafe/screenshots' --app-init-delay 2000 chrome:headless tests/testcafe", "test:e2e:testcafe:verbose": "testcafe -S -s 'tests/testcafe/screenshots' --app-init-delay 2000 chrome tests/testcafe", "plop": "plop" diff --git a/stack-compose.yml b/stack-compose.yml index 07f31bc..a569c8d 100644 --- a/stack-compose.yml +++ b/stack-compose.yml @@ -11,5 +11,3 @@ services: order: start-first ports: - 3000:3000 - environment: - API_URL: ${API_URL}