Merge branch 'master' into 'production'

Env testing

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

.deploy_dev.sh

@@ -8,7 +8,7 @@ pushd deployment-frontend
 
 docker-compose down
 docker pull "$1"
-docker-compose up -d frontend
+API_URL=http://web.sik.party:8000/api docker-compose up -d frontend
 
 popd
 

.gitlab-ci.yml

@@ -32,19 +32,9 @@ 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
@@ -57,7 +47,7 @@ test:e2e:
     only:
         - master
     script:
-        - npm run test:e2e
+        - API_URL=http://web.sik.party:8000/api npm run test:e2e
 
 publish:
     stage: publish
@@ -69,8 +59,8 @@ publish:
     script:
         - docker info
         - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-        - docker build . -t "$IMAGE_NAME"
-        - docker push "$IMAGE_NAME"
+        - docker build . -t "$IMAGE_NAME":latest
+        - docker push "$IMAGE_NAME":latest
 
 publish_prod:
     stage: publish
@@ -82,7 +72,7 @@ publish_prod:
     script:
         - docker info
         - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-        - docker build . -t "$IMAGE_NAME":prod
+        - docker build . -f Dockerfile.prod -t "$IMAGE_NAME":prod
         - docker push "$IMAGE_NAME":prod
 
 deploy_dev:
@@ -105,7 +95,7 @@ deploy_dev:
         - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/docker-compose.yml
         - scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment-frontend/deploy_dev.sh
         - ssh $DEV_SSH_USER@$DEV_SSH_HOST "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"
-        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment-frontend/deploy_dev.sh \"$IMAGE_NAME\""
+        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment-frontend/deploy_dev.sh \"$IMAGE_NAME:latest\""
 
 deploy_production:
     stage: deploy

Dockerfile.prod

@@ -0,0 +1,15 @@
+FROM node:12-alpine as builder
+
+RUN apk add --no-cache libpng-dev gcc make g++ zlib-dev bash lcms2-dev autoconf automake libtool nasm
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm ci --only-prod
+
+COPY . ./
+ENV API_URL https://sika.sik.party/api
+CMD npm run build
+
+FROM fnichol/uhttpd AS server
+EXPOSE 3000
+COPY --from=builder /app/build /www
+ENTRYPOINT ["/usr/sbin/run_uhttpd", "-f", "-p", "3000", "-h", "/www", "-E", "/"]