From 2ee2fca8aebbfc3685d6af3f3163230e26aa1bb0 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Wed, 6 Aug 2025 23:00:04 +0300 Subject: [PATCH] Use the Dockerfile from the main branch There is no way to change the Dockerfile in a tag. We need to use the Dockerfile in the main branch. So even if we're buildin the image for a stable version, we need to check out the main branch. The Dockerfile will take care of checking out the proper tags. Signed-off-by: Gabriel Adrian Samfira --- .github/workflows/build-and-push.yml | 1 - Dockerfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 93dd9a757..35560e679 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -26,7 +26,6 @@ jobs: - name: "Checkout" uses: actions/checkout@v4 with: - ref: ${{ inputs.ref }} path: src/github.com/cloudbase/garm fetch-depth: 0 diff --git a/Dockerfile b/Dockerfile index 045581f6b..2444443d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN cd /build/garm/cmd/garm-cli \ -tags osusergo,netgo,sqlite_omit_load_extension \ -ldflags "-linkmode external -extldflags '-static' -s -w -X github.com/cloudbase/garm/util/appdefaults.Version=$(git describe --tags --match='v[0-9]*' --dirty --always)" \ . && upx /bin/garm-cli -RUN set -e; \ +RUN set -ex; \ mkdir -p /opt/garm/providers.d; \ for repo in \ cloudbase/garm-provider-azure \