diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 93dd9a75..35560e67 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 045581f6..81033292 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ LABEL stage=builder RUN apk add --no-cache musl-dev gcc libtool m4 autoconf g++ make libblkid util-linux-dev git linux-headers upx curl jq RUN git config --global --add safe.directory /build && git config --global --add advice.detachedHead false +RUN echo ${GARM_REF} ADD . /build/garm @@ -19,7 +20,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 \