From 2869201f072168b9ad57cfe2bdf67db1d3202961 Mon Sep 17 00:00:00 2001 From: Maxim Babichev Date: Sat, 10 Feb 2024 18:25:36 +0300 Subject: [PATCH] commit from repository --- .github/workflows/builder.yaml | 1 - Dockerfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/builder.yaml b/.github/workflows/builder.yaml index 70848e9..0ce0b90 100644 --- a/.github/workflows/builder.yaml +++ b/.github/workflows/builder.yaml @@ -57,4 +57,3 @@ jobs: platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/ppc64le build-args: | version=${{ github.ref_name }} - commit=${{ github.sha }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 8e7400e..6b4c911 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,11 @@ LABEL org.opencontainers.image.description="⛵ The immutable, decentralized, st LABEL org.opencontainers.image.licenses=Apache-2.0 ARG version -ARG commit RUN apk --no-cache add git &&\ git clone --depth=1 --branch v0.24.6 https://github.com/mudler/edgevpn.git /tmp/edgevpn &&\ cd /tmp/edgevpn &&\ + export commit=$(git rev-parse HEAD) &&\ go build -v -ldflags "-s -w -X 'github.com/mudler/edgevpn/internal.Version=${version:-dev}' -X 'github.com/mudler/edgevpn/internal.Commit=${commit:-dev}'" -o /edgevpn &&\ cd - &&\ rm -rf /tmp/edgevpn