From ca1d086bdda64193cb3ec275e95e947ba18d009b Mon Sep 17 00:00:00 2001
From: Tobias Steiner <tobinski@dodis.ch>
Date: Tue, 11 Jun 2019 12:32:01 +0200
Subject: [PATCH] Update gitlab-ci

---
 .gitlab-ci.yml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 824bd11..011e436 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,23 @@
+image: docker:latest
+
 services:
   - docker:dind
 
-variables:
-  IMAGE_TAG: $CI_REGISTRY/$CI_IMAGE:$CI_COMMIT_REF_NAME
-  LATEST_TAG: $CI_REGISTRY/$CI_IMAGE:latest
-
-cache:
-  paths:
-  - node_modules/
+before_script:
+  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
-build:
+build-master:
+  stage: build
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
+    - docker push "$CI_REGISTRY_IMAGE"
   only:
     - master
-  image: docker:latest
-  services:
-  - docker:dind
+
+build:
   stage: build
   script:
-   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-   - docker build -t $IMAGE_TAG .
-   - docker tag $IMAGE_TAG $LATEST_TAG
-   - docker push $IMAGE_TAG
-   - docker push $LATEST_TAG
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+  only:
+    - tags
-- 
GitLab