Skip to content

Commit fece3b3

Browse files
authored
immutable new folder (#5256)
That's a follow up of #5254. It moves to push the immutable images to a private folder `clusterfuzz-immutable-images` --------- Signed-off-by: Javan Lacerda <javanlacerda@google.com>
1 parent 6d17163 commit fece3b3

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

cli/casp/src/casp/utils/docker_utils.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,15 @@
2424

2525
# TODO: Make this configurable.
2626
PROJECT_TO_IMAGE = {
27-
'dev': ("gcr.io/clusterfuzz-images/chromium/base/immutable/dev:"
27+
'dev': ("us-central1-docker.pkg.dev/clusterfuzz-images/"
28+
"clusterfuzz-immutable-images/chromium/base/immutable/dev:"
2829
"20251008165901-utc-893e97e-640142509185-compute-d609115-prod"),
2930
'internal': (
30-
"gcr.io/clusterfuzz-images/chromium/base/immutable/internal:"
31+
"us-central1-docker.pkg.dev/clusterfuzz-images/"
32+
"clusterfuzz-immutable-images/chromium/base/immutable/internal:"
3133
"20251110132749-utc-363160d-640142509185-compute-c7f2f8c-prod"),
32-
'external': ("gcr.io/clusterfuzz-images/base/immutable/external:"
34+
'external': ("us-central1-docker.pkg.dev/clusterfuzz-images/"
35+
"clusterfuzz-immutable-images/base/immutable/external:"
3336
"20251111191918-utc-b5863ff-640142509185-compute-c5c296c-prod")
3437
}
3538
_DEFAULT_WORKING_DIR = '/data/clusterfuzz'

docker/build-immutable.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
# An array of Docker image names to be built.
2222
IMAGES=(
23-
gcr.io/clusterfuzz-images/base/immutable
24-
gcr.io/clusterfuzz-images/chromium/base/immutable
25-
gcr.io/clusterfuzz-images/chromium/builder/immutable
26-
gcr.io/clusterfuzz-images/tworker/immutable
27-
gcr.io/clusterfuzz-images/utask-main-scheduler/immutable
28-
gcr.io/clusterfuzz-images/fuchsia/immutable
23+
us-central1-docker.pkg.dev/clusterfuzz-images/clusterfuzz-immutable-images/base/immutable
24+
us-central1-docker.pkg.dev/clusterfuzz-images/clusterfuzz-immutable-images/chromium/base/immutable
25+
us-central1-docker.pkg.dev/clusterfuzz-images/clusterfuzz-immutable-images/chromium/builder/immutable
26+
us-central1-docker.pkg.dev/clusterfuzz-images/clusterfuzz-immutable-images/tworker/immutable
27+
us-central1-docker.pkg.dev/clusterfuzz-images/clusterfuzz-immutable-images/utask-main-scheduler/immutable
28+
us-central1-docker.pkg.dev/clusterfuzz-images/clusterfuzz-immutable-images/fuchsia/immutable
2929
)
3030

3131
if [ "$3" == "google.com:cluster-fuzz" ]; then
@@ -60,7 +60,7 @@ for image_name in "${IMAGES[@]}"; do
6060
CURRENT_CLUSTERFUZZ_REVISION="$(cat /workspace/revision.txt)"
6161

6262
# Determine the directory containing the Dockerfile and related build context.
63-
project_dir=docker/${image_name#gcr.io/clusterfuzz-images/}
63+
project_dir=docker/${image_name#us-central1-docker.pkg.dev/clusterfuzz-images/clusterfuzz-immutable-images/}
6464
if [ "$3" == "google.com:cluster-fuzz" ]; then
6565
project_dir=docker/google/${image_name#gcr.io/google.com/cluster-fuzz/}
6666
fi

0 commit comments

Comments
 (0)