fix(gitlab): fix linting, space in tag name in gitlab-ci.yml (#28)

Author: mskalka

.gitlab-ci.yml

@@ -31,13 +31,13 @@ bootstrap:
       aud: ${VAULT_ADDR}
   script:
     - vault version
-    - export VAULT_TOKEN="$(vault write -field=token auth/${VAULT_AUTH_MOUNT}/login role=${VAULT_AUTH_ROLE} jwt=${VAULT_JWT_TOKEN})"
+    - export VAULT_TOKEN="$(vault write -field=token "auth/${VAULT_AUTH_MOUNT}/login" "role=${VAULT_AUTH_ROLE}" "jwt=${VAULT_JWT_TOKEN}")"
     - echo "VAULT_TOKEN=${VAULT_TOKEN}" >> build.env
-    - export pypi_user=$(vault kv get -field=username $ARTIFACTORY_TOKEN)
-    - export pypi_password=$(vault kv get -field=password $ARTIFACTORY_TOKEN)
+    - export pypi_user="$(vault kv get -field=username "$ARTIFACTORY_TOKEN")"
+    - export pypi_password="$(vault kv get -field=password "$ARTIFACTORY_TOKEN")"
     - echo "PIP_EXTRA_INDEX_URL=https://${pypi_user}:${pypi_password}@$ARTIFACTORY_URL" >> build.env
-    - echo "NVCR_REGISTRY_PASSWORD=$(vault read -field=password ${NVCR_TOKEN})" >> build.env
-    - echo "GHCR_REGISTRY_PASSWORD=$(vault read -field=pat ${GHCR_TOKEN})" >> build.env
+    - echo "NVCR_REGISTRY_PASSWORD=$(vault read -field=password "${NVCR_TOKEN}")" >> build.env
+    - echo "GHCR_REGISTRY_PASSWORD=$(vault read -field=pat "${GHCR_TOKEN}")" >> build.env
   artifacts:
     access: none
     reports:
@@ -66,18 +66,19 @@ mirror-operator-image:
   before_script:
     - echo "{\"auths\":{\"${NVCR_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${NVCR_REGISTRY_USER}" "${NVCR_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"${GHCR_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${GHCR_REGISTRY_USER}" "${GHCR_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > config.json
   script:
-    - until docker info >/dev/null 2>&1; do sleep 1; done # docker is not always fully ready immediately, sleep until it's online
-    - export IMG_TAG=$(echo ${CI_COMMIT_TAG}|sed 's/operator\// /') # remove `operator/` from the tag
-    - | # fetch the platform-specific image
+    - until docker info >/dev/null 2>&1; do sleep 1; done
+    - export IMG_TAG="${CI_COMMIT_TAG#operator/}"
+    - |
       export IMAGE_TARGETS=""
       for ARCH in ${ARCH_LIST//,/ }; do 
-        docker --config . pull ${GHCR_REGISTRY_IMAGE}:${IMG_TAG} --platform $ARCH # fetch the image from ghcr.io
-        docker --config . tag ${GHCR_REGISTRY_IMAGE}:${IMG_TAG} ${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-$(echo $ARCH|sed 's;linux/;;') # retag the image using the arch
-        docker --config . push ${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-$(echo ${ARCH}|sed 's;linux/;;') # push the new image up to nvcr.io
-        export IMAGE_TARGETS=$IMAGE_TARGETS"--amend ${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-$(echo $ARCH|sed 's;linux/;;') " # add the image to the manifest's `--amend` list
+        ARCH_SUFFIX="${ARCH#linux/}"
+        docker --config . pull "${GHCR_REGISTRY_IMAGE}:${IMG_TAG}" --platform "${ARCH}"
+        docker --config . tag "${GHCR_REGISTRY_IMAGE}:${IMG_TAG}" "${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-${ARCH_SUFFIX}"
+        docker --config . push "${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-${ARCH_SUFFIX}"
+        IMAGE_TARGETS="${IMAGE_TARGETS}--amend ${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-${ARCH_SUFFIX} "
       done
-    - docker --config . manifest create ${NVCR_REGISTRY_IMAGE}:${IMG_TAG} ${IMAGE_TARGETS} # create the new manifest using the two images we just pushed
-    - docker --config . manifest push ${NVCR_REGISTRY_IMAGE}:${IMG_TAG} # push the manifest
+    - docker --config . manifest create "${NVCR_REGISTRY_IMAGE}:${IMG_TAG}" ${IMAGE_TARGETS}
+    - docker --config . manifest push "${NVCR_REGISTRY_IMAGE}:${IMG_TAG}"
 
 mirror-agent-image:
   stage: deploy
@@ -102,17 +103,18 @@ mirror-agent-image:
   before_script:
     - echo "{\"auths\":{\"${NVCR_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${NVCR_REGISTRY_USER}" "${NVCR_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"},\"${GHCR_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${GHCR_REGISTRY_USER}" "${GHCR_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > config.json
   script:
-    - until docker info >/dev/null 2>&1; do sleep 1; done # docker is not always fully ready immediately, sleep until it's online
-    - export IMG_TAG=$(echo ${CI_COMMIT_TAG}|sed 's/agent\// /') # remove `agent/` from the tag
-    - | # fetch the platform-specific image
+    - until docker info >/dev/null 2>&1; do sleep 1; done
+    - export IMG_TAG="${CI_COMMIT_TAG#agent/}"
+    - |
       export IMAGE_TARGETS=""
       for ARCH in ${ARCH_LIST//,/ }; do 
-        docker --config . pull ${GHCR_REGISTRY_IMAGE}:${IMG_TAG} --platform $ARCH # fetch the image from ghcr.io
-        docker --config . tag ${GHCR_REGISTRY_IMAGE}:${IMG_TAG} ${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-$(echo $ARCH|sed 's;linux/;;') # retag the image using the arch
-        docker --config . push ${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-$(echo ${ARCH}|sed 's;linux/;;') # push the new image up to nvcr.io
-        export IMAGE_TARGETS=$IMAGE_TARGETS"--amend ${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-$(echo $ARCH|sed 's;linux/;;') " # add the image to the manifest's `--amend` list
+        ARCH_SUFFIX="${ARCH#linux/}"
+        docker --config . pull "${GHCR_REGISTRY_IMAGE}:${IMG_TAG}" --platform "${ARCH}"
+        docker --config . tag "${GHCR_REGISTRY_IMAGE}:${IMG_TAG}" "${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-${ARCH_SUFFIX}"
+        docker --config . push "${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-${ARCH_SUFFIX}"
+        IMAGE_TARGETS="${IMAGE_TARGETS}--amend ${NVCR_REGISTRY_IMAGE}:${IMG_TAG}-${ARCH_SUFFIX} "
       done
-    - docker --config . manifest create ${NVCR_REGISTRY_IMAGE}:${IMG_TAG} ${IMAGE_TARGETS} # create the new manifest using the two images we just pushed
-    - docker --config . manifest push ${NVCR_REGISTRY_IMAGE}:${IMG_TAG} # push the manifest
+    - docker --config . manifest create "${NVCR_REGISTRY_IMAGE}:${IMG_TAG}" ${IMAGE_TARGETS}
+    - docker --config . manifest push "${NVCR_REGISTRY_IMAGE}:${IMG_TAG}"