From 04444320a50f4a7d620333f50591175daaca71dc Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 17 Dec 2019 21:32:54 +0200 Subject: [PATCH] Seperate dev and prod builds --- .gitlab-ci.yml | 25 +++++++++++++++++++++++++ stack-compose.yml | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f15681d..8751a51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,6 +32,16 @@ sass:lint: ts:build: image: node:12 stage: build + only: + - master + script: + - API_URL=http://web.sik.party:8000 npm run build + +prod:build: + image: node:12 + stage: build + only: + - production script: - API_URL=https://sika.sik.party/api npm run build @@ -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 diff --git a/stack-compose.yml b/stack-compose.yml index 2520368..07f31bc 100644 --- a/stack-compose.yml +++ b/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: