From 6a663784a8594417652143ba0e3f0371963da0c7 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Thu, 11 Jan 2024 10:29:50 -0600 Subject: [PATCH] use VERSION in the build file Signed-off-by: Kevin Carter --- .github/workflows/release-horizon-rxt.yml | 8 ++++---- Containerfiles/HorizonRXT-Containerfile | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-horizon-rxt.yml b/.github/workflows/release-horizon-rxt.yml index 86344022..b8682826 100644 --- a/.github/workflows/release-horizon-rxt.yml +++ b/.github/workflows/release-horizon-rxt.yml @@ -11,9 +11,9 @@ on: default: 'master' type: choice options: - - "master" - - "2023.1" - - "2023.2" + - "master" + - "2023.1" + - "2023.2" # Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds. env: @@ -57,4 +57,4 @@ jobs: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/horizon-rxt:${{ github.event.inputs.release }}-ubuntu_jammy labels: ${{ steps.meta.outputs.labels }} build-args: | - RELEASE=${{ github.event.inputs.release }} + VERSION=${{ github.event.inputs.release }} diff --git a/Containerfiles/HorizonRXT-Containerfile b/Containerfiles/HorizonRXT-Containerfile index b5c84efc..8e6f5a15 100644 --- a/Containerfiles/HorizonRXT-Containerfile +++ b/Containerfiles/HorizonRXT-Containerfile @@ -1,5 +1,5 @@ -ARG RELEASE=master -FROM openstackhelm/horizon:${RELEASE}-ubuntu_jammy -RUN /var/lib/openstack/bin/pip install --constraint=https://releases.openstack.org/constraints/upper/${RELEASE} \ +ARG VERSION=master +FROM openstackhelm/horizon:${VERSION}-ubuntu_jammy +RUN /var/lib/openstack/bin/pip install --constraint=https://releases.openstack.org/constraints/upper/${VERSION} \ heat-dashboard \ octavia-dashboard