SW-966: Deploy lofar-pulp with a docker tag equal to the branch or tag name.

.gitlab-ci.yml

@@ -134,7 +134,7 @@ build_MCU_MAC:
 build_lofar_pulp_docker_image:
   stage: build
   script:
-    - docker build --build-arg BASE_VERSION=$CI_COMMIT_SHORT_SHA -t ci_lofar_pulp:$CI_COMMIT_SHORT_SHA Docker/lofar-pulp
+    - docker build --build-arg BASE_VERSION=$CI_COMMIT_SHORT_SHA --build-arg LOFAR_TAG=$CI_COMMIT_REF_NAME -t ci_lofar_pulp:$CI_COMMIT_SHORT_SHA Docker/lofar-pulp
   interruptible: true
   needs:
     - build_pulp_docker_image
@@ -414,10 +414,8 @@ deploy-PULP:
     - ssh-keyscan head.cep4.control.lofar >> ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   script:
-    # notice we do NOT use 'lofar-pulp' as name here (yet)
-    # TODO: when the new pulp-image-via-gitlab-via-nexus-to-cep4 is done and working, then and only then rename it here to the widely used docker image name 'lofar-pulp'
     - ssh lofarsys@head.cep4.control.lofar "clush -S -P -w cpu[01-50] -w gpu[01-04] -w head[01-02] docker pull $CI_NEXUS_REGISTRY_LOCATION/ci_lofar_pulp:$CI_COMMIT_SHORT_SHA"
-    - ssh lofarsys@head.cep4.control.lofar "clush -S -P -w cpu[01-50] -w gpu[01-04] -w head[01-02] docker tag $CI_NEXUS_REGISTRY_LOCATION/ci_lofar_pulp:$CI_COMMIT_SHORT_SHA ci_lofar_pulp:latest"
+    - ssh lofarsys@head.cep4.control.lofar "clush -S -P -w cpu[01-50] -w gpu[01-04] -w head[01-02] docker tag $CI_NEXUS_REGISTRY_LOCATION/ci_lofar_pulp:$CI_COMMIT_SHORT_SHA lofar-pulp:$CI_COMMIT_REF_NAME"
   needs:
     - dockerize_PULP
   when: manual

Docker/lofar-pulp/Dockerfile

@@ -70,6 +70,11 @@ RUN apt-get update && apt-get install -y liblog4cplus-dev libhdf5-dev libblitz0-
     apt-get purge -y liblog4cplus-dev libhdf5-dev libblitz0-dev libunittest++-dev libxml++2.6-dev binutils-dev && \
     apt-get autoremove -y
 
+
+# The tag under which this image will be deployed
+ARG LOFAR_TAG=${BASE_VERSION}
+ENV LOFAR_TAG=${LOFAR_TAG}
+
 COPY ["bashrc", "/opt/"]
 COPY ["chuser.sh", "/usr/local/bin"]
 ENTRYPOINT ["/usr/local/bin/chuser.sh"]