From 76b181afebee0c696d61e0b86a95cb4422b3e6e8 Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Tue, 22 Aug 2023 11:01:13 +0100 Subject: [PATCH 1/2] Use Rocky Linux 9 as base for kayobe-automation By default, kayobe-automation uses CentOS Stream 8 as the base image for its kayobe docker image. As it doesn't support python 3.8 (a requirement for the Zed release), it must be overridden to use Rocky Linux 9. (cherry picked from commit bc87579eb5d028947d5596c0c48c6a074212498f) --- .github/workflows/stackhpc-build-kayobe-image.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/stackhpc-build-kayobe-image.yml b/.github/workflows/stackhpc-build-kayobe-image.yml index 8c8ce4d2f..826f83bb1 100644 --- a/.github/workflows/stackhpc-build-kayobe-image.yml +++ b/.github/workflows/stackhpc-build-kayobe-image.yml @@ -21,6 +21,10 @@ on: no_proxy: type: string required: false + base_image: + type: string + required: false + default: "rockylinux:9" if: description: Whether to run the workflow (workaround for required status checks issue) type: boolean @@ -49,7 +53,7 @@ jobs: - name: Checkout kayobe config uses: actions/checkout@v4 with: - submodules: true + submodules: true - name: Log in to the Container registry uses: docker/login-action@v3 @@ -88,6 +92,7 @@ jobs: build-args: | http_proxy=${{ inputs.http_proxy }} https_proxy=${{ inputs.https_proxy }} + BASE_IMAGE=${{ inputs.base_image }} KAYOBE_USER_UID=1001 KAYOBE_USER_GID=1001 push: true From 40b00d7b4085f332c4965d09048072f62c5658c4 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 15 Jan 2024 13:23:32 +0000 Subject: [PATCH 2/2] CI: Fix default kayobe base image when built on push Inputs are not available to workflows triggered by a push. Apply a default to the base image. (cherry picked from commit 359ee380260ed9c4514d6ffccf702bce2d55fd83) --- .github/workflows/stackhpc-build-kayobe-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stackhpc-build-kayobe-image.yml b/.github/workflows/stackhpc-build-kayobe-image.yml index 826f83bb1..c45e0456b 100644 --- a/.github/workflows/stackhpc-build-kayobe-image.yml +++ b/.github/workflows/stackhpc-build-kayobe-image.yml @@ -92,7 +92,7 @@ jobs: build-args: | http_proxy=${{ inputs.http_proxy }} https_proxy=${{ inputs.https_proxy }} - BASE_IMAGE=${{ inputs.base_image }} + BASE_IMAGE=${{ inputs.base_image || 'rockylinux:9' }} KAYOBE_USER_UID=1001 KAYOBE_USER_GID=1001 push: true