update gitlab-ci.yml

.gitlab-ci.yml

@@ -30,14 +30,13 @@ docker_kea_oss:
     - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
     - docker pull $DOCKER_URL/kea-oss-1.4.0:latest || true
     - cd 1.4.0/kea-oss
-    - docker build --no-cache --tag $DOCKER_URL/kea-oss-1.4.0:"${CI_COMMIT_TAG##v}" --tag $DOCKER_URL/kea-oss-1.4.0:latest .
+    - docker build --no-cache --tag $DOCKER_URL/kea-oss-1.4.0:latest .
     - docker push $DOCKER_URL/kea-oss-1.4.0:latest
-    - docker push $DOCKER_URL/kea-oss-1.4.0:"${CI_COMMIT_TAG##v}"
   only:
     refs:
-      - tags
+      - pushes
     variables:
-      - $CI_COMMIT_TAG =~ /^v[0-9]+(.[0-9]+)*/
+      - $CI_COMMIT_REF_NAME == "master"
 
 docker_kea_ik:
   stage: build
@@ -45,11 +44,24 @@ docker_kea_ik:
     - docker info
     - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
     - docker pull $DOCKER_URL/kea-oss-1.4.0:latest || true
-    - docker pull $DOCKER_URL/kea_ik:latest || true
     - cd 1.4.0/kea-ik
-    - docker build --no-cache --tag $DOCKER_URL/kea_ik:"${CI_COMMIT_TAG##v}" --tag $DOCKER_URL/kea_ik:latest .
+    - docker build --no-cache --tag $DOCKER_URL/kea-ik-1.4.0:latest .
     - docker push $DOCKER_URL/kea_ik:latest
-    - docker push $DOCKER_URL/kea_ik:"${CI_COMMIT_TAG##v}"
+  only:
+    refs:
+      - pushes
+    variables:
+      - $CI_COMMIT_REF_NAME == "master"
+
+docker_kea_ik_tag:
+  stage: build
+  script:
+    - docker info
+    - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
+    - docker pull $DOCKER_URL/kea-oss-1.4.0:latest || true
+    - cd 1.4.0/kea-ik
+    - docker build --no-cache --tag $DOCKER_URL/kea-ik-1.4.0:${CI_COMMIT_TAG} .
+    - docker push $DOCKER_URL/kea_ik:${CI_COMMIT_TAG}
   only:
     refs:
       - tags