From bf50ffdf61074574ce933f5b4b3cd8ff22e77d35 Mon Sep 17 00:00:00 2001 From: David Zager Date: Mon, 3 Jun 2024 09:53:10 -0400 Subject: [PATCH] :ghost: use build args for the tags (#124) Signed-off-by: David Zager --- .github/workflows/multi-arch_images_build.yaml | 6 ++---- Dockerfile | 6 ++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/multi-arch_images_build.yaml b/.github/workflows/multi-arch_images_build.yaml index b374de7..9603b34 100644 --- a/.github/workflows/multi-arch_images_build.yaml +++ b/.github/workflows/multi-arch_images_build.yaml @@ -28,10 +28,8 @@ jobs: image_name: "windup-shim" image_namespace: "konveyor" image_registry: "quay.io" - pre_build_cmd: | - TAG=${GITHUB_REF_NAME/main/latest} - sed -i "s,FROM quay.io/konveyor/analyzer-lsp.*,FROM quay.io/konveyor/analyzer-lsp:${TAG}," core.Dockerfile - sed -i "s,FROM quay.io/konveyor/java-external-provider.*,FROM quay.io/konveyor/java-external-provider:${TAG}," core.Dockerfile + extra-args: | + --build-arg VERSION=${{ github.ref_name == 'main' && 'latest' || github.ref_name }} quay_publish_robot: ${{ secrets.QUAY_PUBLISH_ROBOT }} quay_publish_token: ${{ secrets.QUAY_PUBLISH_TOKEN }} ref: ${{ github.ref }} diff --git a/Dockerfile b/Dockerfile index c538d05..6d35559 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +ARG VERSION=latest + FROM golang:1.21 as builder WORKDIR /windup-shim @@ -8,10 +10,10 @@ COPY main.go /windup-shim RUN go build -o windup-shim main.go -FROM quay.io/konveyor/analyzer-lsp:latest as analyzer-lsp +FROM quay.io/konveyor/analyzer-lsp:${VERSION} as analyzer-lsp # This is the container built from the Dockerfile in the analyzer-lsp project -FROM quay.io/konveyor/java-external-provider:latest +FROM quay.io/konveyor/java-external-provider:${VERSION} # TODO debug only RUN microdnf install -y procps vim wget unzip git