gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge PR #70297 into umbrella

Browse Source 
* refs/pull/70297/head:
	container: default FROM_IMAGE to Rocky Linux 10

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>
This commit is contained in:
Patrick Donnelly 2026-07-20 14:56:28 -04:00
commit bf7fde4f8e
No known key found for this signature in database
GPG Key ID: 053758C0A8A3CE2F
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container/Containerfile
View File

@ -1,4 +1,4 @@
ARG FROM_IMAGE="quay.io/centos/centos:stream9"
ARG FROM_IMAGE="docker.io/rockylinux/rockylinux:10"
FROM $FROM_IMAGE
# allow FROM_IMAGE to be visible inside this stage

4
container/build.sh
View File

@ -16,7 +16,7 @@ usage() {
$0 [containerfile] (defaults to 'Containerfile')
For a CI build (from ceph-ci.git, built and pushed to shaman):
CI_CONTAINER: must be 'true'
FROM_IMAGE: defaults to quay.io/centos/centos9:stream
FROM_IMAGE: defaults to docker.io/rockylinux/rockylinux:10
FLAVOR (OSD flavor, default or crimson)
BRANCH (of Ceph. <remote>/<ref>)
CEPH_SHA1 (of Ceph)
@ -125,7 +125,7 @@ CONTAINER_BUILD_ARGS=(
--squash
-f "$CFILE"
-t build.sh.output
--build-arg FROM_IMAGE="${FROM_IMAGE:-quay.io/centos/centos:stream9}"
--build-arg FROM_IMAGE="${FROM_IMAGE:-docker.io/rockylinux/rockylinux:10}"
--build-arg CEPH_SHA1="${CEPH_SHA1}"
--build-arg CEPH_GIT_REPO="${CEPH_GIT_REPO}"
--build-arg CEPH_REF="${BRANCH:-main}"