From 380410947ef748af3a38da298aa2a17b2d000aa2 Mon Sep 17 00:00:00 2001 From: Magnus Longva Date: Mon, 28 Aug 2023 14:09:13 +0200 Subject: [PATCH] removed debugging echo, added comments --- buildah-image-builder/Dockerfile | 3 ++- buildah-image-builder/cmd.sh | 10 ++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/buildah-image-builder/Dockerfile b/buildah-image-builder/Dockerfile index 3638447..e05b18d 100644 --- a/buildah-image-builder/Dockerfile +++ b/buildah-image-builder/Dockerfile @@ -1,3 +1,4 @@ FROM quay.io/buildah/stable:v1.30.0 COPY cmd.sh / -CMD /cmd.sh \ No newline at end of file +CMD /cmd.sh +# TODO: mark git dir as safe for edit \ No newline at end of file diff --git a/buildah-image-builder/cmd.sh b/buildah-image-builder/cmd.sh index 66ba762..3cccdfd 100755 --- a/buildah-image-builder/cmd.sh +++ b/buildah-image-builder/cmd.sh @@ -1,17 +1,11 @@ #!/bin/bash set -e buildah login --username ${BUILDAH_USERNAME} --password ${BUILDAH_PASSWORD} ${DOCKER_REGISTRY}.azurecr.io -#debug line below -echo buildah build --storage-driver=vfs --isolation=chroot --jobs 0 \ - ${SECRET_ARGS} --file ${CONTEXT}${DOCKER_FILE_NAME} \ - --tag ${IMAGE} \ - --tag ${CLUSTERTYPE_IMAGE} \ - --tag ${CLUSTERNAME_IMAGE} \ - ${CONTEXT} buildah build --storage-driver=vfs --isolation=chroot --jobs 0 \ ${SECRET_ARGS} --file ${CONTEXT}${DOCKER_FILE_NAME} \ --tag ${IMAGE} \ --tag ${CLUSTERTYPE_IMAGE} \ --tag ${CLUSTERNAME_IMAGE} \ ${CONTEXT} -buildah push --storage-driver=vfs --all ${IMAGE} \ No newline at end of file +buildah push --storage-driver=vfs --all ${IMAGE} +# TODO: reset to correct git commit hash \ No newline at end of file