Skip to content

Commit acbf4c9

Browse files
authored
Merge pull request #2182 from stackhpc/use-new-rockylinux-image
CI: Use rockylinux/rockylinux:9 image
2 parents 5572063 + 97d5bd9 commit acbf4c9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/stackhpc-build-kayobe-image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
base_image:
2525
type: string
2626
required: false
27-
default: "rockylinux:9"
27+
default: "rockylinux/rockylinux:9"
2828
if:
2929
description: Whether to run the workflow (workaround for required status checks issue)
3030
type: boolean
@@ -92,7 +92,7 @@ jobs:
9292
build-args: |
9393
http_proxy=${{ inputs.http_proxy }}
9494
https_proxy=${{ inputs.https_proxy }}
95-
BASE_IMAGE=${{ inputs.base_image || 'rockylinux:9' }}
95+
BASE_IMAGE=${{ inputs.base_image || 'rockylinux/rockylinux:9' }}
9696
USE_PYTHON_312=true
9797
KAYOBE_USER_UID=1001
9898
KAYOBE_USER_GID=1001

doc/source/operations/tempest.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Build a Kayobe automation image:
103103
git submodule update
104104
# If running on Ubuntu, the fact cache can confuse Kayobe in the Rocky-based container
105105
mv etc/kayobe/facts{,-old}
106-
sudo DOCKER_BUILDKIT=1 docker build --network host --build-arg BASE_IMAGE=rockylinux:9 --file .automation/docker/kayobe/Dockerfile --tag kayobe:latest .
106+
sudo DOCKER_BUILDKIT=1 docker build --network host --build-arg BASE_IMAGE=rockylinux/rockylinux:9 --file .automation/docker/kayobe/Dockerfile --tag kayobe:latest .
107107
108108
Configuration
109109
=============

etc/kayobe/environments/ci-aio/automated-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ run_tempest() {
203203
if ! sudo docker image inspect kayobe:latest > /dev/null 2>&1; then
204204
echo "Building Kayobe Automation image"
205205
sudo DOCKER_BUILDKIT=1 docker build \
206-
--build-arg BASE_IMAGE=rockylinux:9 \
206+
--build-arg BASE_IMAGE=rockylinux/rockylinux:9 \
207207
--build-arg USE_PYTHON_312=true \
208208
--file .automation/docker/kayobe/Dockerfile \
209209
--tag kayobe:latest \

0 commit comments

Comments
 (0)