diff --git a/csp-lmc-mid/.make/k8s.mk b/csp-lmc-mid/.make/k8s.mk index c49aa84a704b6757e638976a5adf84a01eeebe87..c3eb95b118daa4e4f96b7b4cf3d836ab53a9ebc3 100644 --- a/csp-lmc-mid/.make/k8s.mk +++ b/csp-lmc-mid/.make/k8s.mk @@ -17,7 +17,7 @@ CI_PROJECT_IMAGE := SET_IMAGE_TAG = --set mid-csp.midcsplmc.image.registry=$(CI_REGISTRY)/ska-telescope \ --set mid-csp.midcsplmc.image.image=csp-lmc \ --set mid-csp.midcsplmc.image.tag=$(CI_COMMIT_SHORT_SHA) -IMAGE_TO_TEST = $(CI_REGISTRY_IMAGE)/$(CI_COMMIT_SHORT_SHA) +IMAGE_TO_TEST = $(CI_REGISTRY_IMAGE):$(CI_COMMIT_SHORT_SHA) endif .DEFAULT_GOAL := help diff --git a/csp-lmc-mid/Dockerfile.gitlab b/csp-lmc-mid/Dockerfile.gitlab index ed78116d955f062e949122cdb7ec485047ba06cc..95fac141c2b147b68652b65ab105a03a0a599322 100644 --- a/csp-lmc-mid/Dockerfile.gitlab +++ b/csp-lmc-mid/Dockerfile.gitlab @@ -1,3 +1,8 @@ +# Dockerfile used during CI/CD pipeline execution. +# The docker image is built using the csp-lmc-common python +# package uploaded to the gitlab Package Repository. +# PROJECT_ID: is the csp-lmc project ID under Gitlab: the value is passed as argument +# during the image build stage. FROM nexus.engageska-portugal.pt/ska-docker/ska-python-buildenv:9.3.2 AS buildenv FROM nexus.engageska-portugal.pt/ska-docker/ska-python-runtime:9.3.2 AS runtime @@ -7,7 +12,7 @@ RUN ipython profile create ENV PATH=/home/tango/.local/bin:$PATH ARG PROJECT_ID # install all ska packages from nexus repository before installing the dev -# csp-lmc-common package. In this way the csp-òmc-common dependencies are already +# csp-lmc-common package. In this way the csp-lmc-common dependencies are already # in place and the package can be installed from the gitlab repo without errors. RUN python3 -m pip install -r requirements-gitlab.txt . #install