update gitlab-ci.yml

.gitlab-ci.yml

@@ -56,8 +56,8 @@ docker_version_tag_base:
     - docker info
     - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
     - docker pull $CONTAINER_IMAGE_BASE:latest || true
-    - docker build --no-cache --tag $CONTAINER_IMAGE_BASE:"${CI_COMMIT_TAG##v}" .
-    - docker push $CONTAINER_IMAGE_BASE:"${CI_COMMIT_TAG##v}"
+    - docker build --no-cache --tag $CONTAINER_IMAGE_BASE:${CI_COMMIT_TAG} ./genieacs-base/
+    - docker push $CONTAINER_IMAGE_BASE:${CI_COMMIT_TAG}
   only:
     refs:
       - tags
@@ -88,8 +88,8 @@ docker_version_tag_cwmp:
     - docker info
     - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
     - docker pull $CONTAINER_IMAGE_CWMP:latest || true
-    - docker build --no-cache --tag $CONTAINER_IMAGE_CWMP:"${CI_COMMIT_TAG##v}" ./genieacs-cwmp/
-    - docker push $CONTAINER_IMAGE_CWMP:"${CI_COMMIT_TAG##v}"
+    - docker build --no-cache --tag $CONTAINER_IMAGE_CWMP:${CI_COMMIT_TAG} ./genieacs-cwmp/
+    - docker push $CONTAINER_IMAGE_CWMP:${CI_COMMIT_TAG}
   only:
     refs:
       - tags
@@ -120,8 +120,8 @@ docker_version_tag_gui:
     - docker info
     - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
     - docker pull $CONTAINER_IMAGE_GUI:latest || true
-    - docker build --no-cache --tag $CONTAINER_IMAGE_GUI:"${CI_COMMIT_TAG##v}" ./genieacs-gui/
-    - docker push $CONTAINER_IMAGE_GUI:"${CI_COMMIT_TAG##v}"
+    - docker build --no-cache --tag $CONTAINER_IMAGE_GUI:${CI_COMMIT_TAG} ./genieacs-gui/
+    - docker push $CONTAINER_IMAGE_GUI:${CI_COMMIT_TAG}
   only:
     refs:
       - tags
@@ -136,7 +136,7 @@ docker_nbi:
     - docker info
     - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
     - docker pull $CONTAINER_IMAGE_NBI:latest || true
-    - docker build --no-cache --tag $CONTAINER_IMAGE_NBI:latest ./genieacs-gui/
+    - docker build --no-cache --tag $CONTAINER_IMAGE_NBI:latest ./genieacs-nbi/
     - docker push $CONTAINER_IMAGE_NBI:latest
   only:
     refs:
@@ -152,8 +152,8 @@ docker_version_tag_nbi:
     - docker info
     - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
     - docker pull $CONTAINER_IMAGE_NBI:latest || true
-    - docker build --no-cache --tag $CONTAINER_IMAGE_NBI:"${CI_COMMIT_TAG##v}" ./genieacs-gui/
-    - docker push $CONTAINER_IMAGE_NBI:"${CI_COMMIT_TAG##v}"
+    - docker build --no-cache --tag $CONTAINER_IMAGE_NBI:${CI_COMMIT_TAG} ./genieacs-nbi/
+    - docker push $CONTAINER_IMAGE_NBI:${CI_COMMIT_TAG}
   only:
     refs:
       - tags
@@ -184,8 +184,8 @@ docker_version_tag_fs:
     - docker info
     - docker login -u $DOCKER_USER -p $DOCKER_PWD docker.infra.flowdat.com
     - docker pull $CONTAINER_IMAGE_FS:latest || true
-    - docker build --no-cache --tag $CONTAINER_IMAGE_FS:"${CI_COMMIT_TAG##v}" ./genieacs-fs/
-    - docker push $CONTAINER_IMAGE_FS:"${CI_COMMIT_TAG##v}"
+    - docker build --no-cache --tag $CONTAINER_IMAGE_FS:${CI_COMMIT_TAG} ./genieacs-fs/
+    - docker push $CONTAINER_IMAGE_FS:${CI_COMMIT_TAG}
   only:
     refs:
       - tags