Merge branch 'master' into 'production'

Prod API_URL for Filebrowser testing

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!5

.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
 

.gitlab-ci.yml

@@ -32,9 +32,19 @@ sass:lint:
 ts:build:
     image: node:12
     stage: build
+    only:
+        - master
     script:
         - API_URL=http://web.sik.party:8000/api npm run build
 
+prod:build:
+    image: node:12
+    stage: build
+    only:
+        - production
+    script:
+        - API_URL=https://sika.sik.party/api npm run build
+
 # test:unit:
 #     image: node:12
 #     stage: test
@@ -44,6 +54,8 @@ ts:build:
 test:e2e:
     image: circleci/node:12-browsers
     stage: test
+    only:
+        - master
     script:
         - npm run test:e2e
 
@@ -60,6 +72,19 @@ publish:
         - docker build . -t "$IMAGE_NAME"
         - docker push "$IMAGE_NAME"
 
+publish_prod:
+    stage: publish
+    image: docker:stable
+    services:
+        - docker:stable-dind
+    only:
+        - production
+    script:
+        - docker info
+        - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+        - docker build . -t "$IMAGE_NAME":prod
+        - docker push "$IMAGE_NAME":prod
+
 deploy_dev:
     stage: deploy
     image: alpine:latest

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": "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: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"

stack-compose.yml

@@ -2,7 +2,7 @@ version: '3.4'
 
 services:
   frontend:
-    image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-frontend:latest
+    image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-frontend:prod
     deploy:
       replicas: 1
       restart_policy:
@@ -11,5 +11,3 @@ services:
         order: start-first
     ports:
       - 3000:3000
-    environment:
-      API_URL: ${API_URL}