djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not fail when KUBE_GIT_VERSION is not set

Browse Source
This commit is contained in:
Joshua Casey 2023-08-29 17:31:22 -05:00
parent a42e3edf56
commit 7cda8f4123
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/prepare-for-integration-tests.sh
View File

@ -205,13 +205,14 @@ registry_repo_tag="${registry_repo}:${tag}"
if [[ "$do_build" == "yes" ]]; then if [[ "$do_build" == "yes" ]]; then
# Rebuild the code # Rebuild the code
testing_version="${$KUBE_GIT_VERSION:-}"
if [[ "$dockerfile_path" != "" ]]; then if [[ "$dockerfile_path" != "" ]]; then
log_note "Docker building the app with dockerfile $dockerfile_path and KUBE_GIT_VERSION=$KUBE_GIT_VERSION" log_note "Docker building the app with dockerfile $dockerfile_path and KUBE_GIT_VERSION=$testing_version"
DOCKER_BUILDKIT=1 docker build . --tag "$registry_repo_tag" --file "$dockerfile_path" --build-arg "KUBE_GIT_VERSION=$KUBE_GIT_VERSION" DOCKER_BUILDKIT=1 docker build . --tag "$registry_repo_tag" --file "$dockerfile_path" --build-arg "KUBE_GIT_VERSION=$testing_version"
else else
log_note "Docker building the app with KUBE_GIT_VERSION=$KUBE_GIT_VERSION" log_note "Docker building the app with KUBE_GIT_VERSION=$testing_version"
# DOCKER_BUILDKIT=1 is optional on MacOS but required on linux. # DOCKER_BUILDKIT=1 is optional on MacOS but required on linux.
DOCKER_BUILDKIT=1 docker build . --tag "$registry_repo_tag" --build-arg "KUBE_GIT_VERSION=$KUBE_GIT_VERSION" DOCKER_BUILDKIT=1 docker build . --tag "$registry_repo_tag" --build-arg "KUBE_GIT_VERSION=$testing_version"
fi fi
fi fi