diff --git a/templates/buildah-build.yml b/templates/buildah-build.yml index 32d239a2fc6a08728da2539933b29f2867e6f2f7..a7baad4cbd2e7ea41a9b1de686c0c958058bedd2 100644 --- a/templates/buildah-build.yml +++ b/templates/buildah-build.yml @@ -122,7 +122,7 @@ $[[ inputs.as_job ]]: IMAGE_TAG="${IMAGE_TAG}-$ARCH" fi # Ensure to strip any whitespace and send a curl request to each URL - CONTAINER_BUILD_IAMGE_TAGS="${CONTAINER_BUILD_IAMGE_TAGS}-t $(echo $IMAGE_TAG | xargs) " + CONTAINER_BUILD_IMAGE_TAGS="${CONTAINER_BUILD_IMAGE_TAGS}-t $(echo $IMAGE_TAG | xargs) " done # Extract the base image name from the Dockerfile @@ -132,8 +132,8 @@ $[[ inputs.as_job ]]: echo "DOCKERFILE $DOCKERFILE does not exist." fi - | - echo "Building ${CONTAINER_BUILD_IAMGE_TAGS}..." - eval $(echo "buildah build "${CONTAINER_BUILD_IAMGE_TAGS}" \ + echo "Building ${CONTAINER_BUILD_IMAGE_TAGS}..." + eval $(echo "buildah build "${CONTAINER_BUILD_IMAGE_TAGS}" \ --file "${DOCKERFILE}" --layers $CONTAINER_BUILD_EXTRA_ARGS \ --sbom trivy --sbom-output build-artifacts/sbom.json \ --build-arg COMMIT_HASH=\"${CI_COMMIT_SHORT_SHA}\" \ diff --git a/templates/kaniko-build.yml b/templates/kaniko-build.yml index 183bb1db138039dd63b45c8aedc6613b2e8a7fd3..eaf4533df506f8e189697a9af43534d70796dcc6 100644 --- a/templates/kaniko-build.yml +++ b/templates/kaniko-build.yml @@ -124,7 +124,7 @@ $[[ inputs.as_job ]]: fi # Ensure to strip any whitespace and send a curl request to each URL echo $IMAGE_TAG - CONTAINER_BUILD_IAMGE_TAGS="${CONTAINER_BUILD_IAMGE_TAGS}--destination $(echo $IMAGE_TAG | xargs) " + CONTAINER_BUILD_IMAGE_TAGS="${CONTAINER_BUILD_IMAGE_TAGS}--destination $(echo $IMAGE_TAG | xargs) " done # Extract the base image name from the Dockerfile @@ -134,7 +134,7 @@ $[[ inputs.as_job ]]: echo "DOCKERFILE $DOCKERFILE does not exist." fi - echo "Building ${CONTAINER_BUILD_IAMGE_TAGS}..." + echo "Building ${CONTAINER_BUILD_IMAGE_TAGS}..." echo "Using context \"${CONTEXT}\" with dockerfile \"${DOCKERFILE}\"" - | echo "Building image with kaniko..." @@ -160,7 +160,7 @@ $[[ inputs.as_job ]]: --label org.opencontainers.image.title=\"$CI_PROJECT_NAME\" \ --label org.opencontainers.image.description=\"$DESCRIPTION\" \ --label org.opencontainers.image.base.name=\"${BASE_IMG_NAME}\" \ - $CONTAINER_BUILD_IAMGE_TAGS $CONTAINER_BUILD_EXTRA_ARGS") + $CONTAINER_BUILD_IMAGE_TAGS $CONTAINER_BUILD_EXTRA_ARGS") artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" paths: