Fix the version passed to the image

Contrary to what internet resources say, ${{github.event.ref}} also contains the `ref/tags/` prefix. That is removed now.

Also, setting the version with plain "-X version.Version" does not seem to work consistently. Adding the full package as a prefix fixes this.
This commit is contained in:
Joris Coenen
2021-04-30 16:12:45 +02:00
parent 5b65196d31
commit 2443979602
2 changed files with 5 additions and 2 deletions

View File

@@ -28,6 +28,9 @@ jobs:
tags: | tags: |
type=semver,pattern={{version}} type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}}.{{minor}}
- name: Get the version from tag
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
- -
name: Set up QEMU name: Set up QEMU
uses: docker/setup-qemu-action@v1 uses: docker/setup-qemu-action@v1
@@ -51,4 +54,4 @@ jobs:
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
build-args: | build-args: |
operator_version=${{ github.event.ref }} operator_version=${{ steps.get_version.outputs.VERSION }}

View File

@@ -16,7 +16,7 @@ ARG operator_version=dev
RUN CGO_ENABLED=0 \ RUN CGO_ENABLED=0 \
GO111MODULE=on \ GO111MODULE=on \
go build \ go build \
-ldflags "-X version.Version=$operator_version" \ -ldflags "-X \"github.com/1Password/onepassword-operator/version.Version=$operator_version\"" \
-mod vendor \ -mod vendor \
-a -o manager main.go -a -o manager main.go