From 97880416346e689cca3f723d31ee55e1f6d9bbb7 Mon Sep 17 00:00:00 2001 From: Damian Badura Date: Tue, 19 Nov 2024 13:10:45 +0100 Subject: [PATCH] wip --- .github/workflows/busola-web-build.yml | 2 +- Dockerfile.web | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/busola-web-build.yml b/.github/workflows/busola-web-build.yml index 99957dfa9a..6fa92545e3 100644 --- a/.github/workflows/busola-web-build.yml +++ b/.github/workflows/busola-web-build.yml @@ -43,4 +43,4 @@ jobs: name: busola-web dockerfile: Dockerfile.web tags: ${{ inputs.tag != '' && inputs.tag || 'latest' }} - build-args: ${{ inputs.tag != '' && format('default_tag={0}', inputs.tag) || '' }} + build-args: ${{ inputs.tag != '' && format('tag={0}', inputs.tag) || '' }} diff --git a/Dockerfile.web b/Dockerfile.web index 0ab91e31ef..2b71f923c3 100644 --- a/Dockerfile.web +++ b/Dockerfile.web @@ -1,6 +1,7 @@ # ---- Base Alpine with Node ---- FROM node:20.17-alpine3.20 AS builder ARG default_tag +ARG tag # Install global dependencies RUN apk update && \ @@ -15,7 +16,7 @@ ENV CI true COPY . /app -RUN yq -i '.version = "'${default_tag}'"' public/version.yaml && \ +RUN export TAG=${tag:-$default_tag} && yq -i '.version = "'${TAG}'"' public/version.yaml && \ make resolve validate RUN npm run build:docker