Merge pull request #18037 from MinaProtocol/local-images

dkijania · web-flow · commit ea6244d30c67 · 2025-10-30T19:25:11.000+01:00
Replacing common images with ones in our repos
diff --git a/buildkite/scripts/run_promote_build_job.sh b/buildkite/scripts/run_promote_build_job.sh
@@ -21,7 +21,7 @@
 #          - "CODENAMES=Focal,Bullseye"
 #          - "FROM_CHANNEL=Unstable"
 #          - "TO_CHANNEL=Experimental"
-#        image: codaprotocol/ci-toolchain-base:v3
+#        image: europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/codaprotocol/ci-toolchain-base:v3
 #        mount-buildkite-agent: true
 #        propagate-environment: true
 
diff --git a/buildkite/src/Constants/ContainerImages.dhall b/buildkite/src/Constants/ContainerImages.dhall
@@ -2,7 +2,8 @@
 -- NOTE: minaToolchain is the default image for various jobs, set to minaToolchainBullseye
 -- NOTE: minaToolchainBullseye is also used for building Ubuntu Focal packages in CI
 -- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI
-{ toolchainBase = "codaprotocol/ci-toolchain-base:v3"
+{ toolchainBase =
+    "europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/codaprotocol/ci-toolchain-base:v3"
 , minaToolchainBookworm =
     { amd64 =
         "gcr.io/o1labs-192920/mina-toolchain@sha256:af79d53279cd58d8c3b013e8c438b479d9067bcdbe8cb32ced74a156bba78e15"
@@ -21,8 +22,9 @@
     "gcr.io/o1labs-192920/mina-toolchain@sha256:ff7224ded94d4b41049c1c2f5b3df0820cf81d435291b116628a6c582e9c5c2b"
 , minaToolchain =
     "gcr.io/o1labs-192920/mina-toolchain@sha256:24c1a641f0d55167006581fd70a013cd90f8a89f3424650ace7ba4210b6825b6"
-, postgres = "postgres:12.4-alpine"
+, postgres =
+    "europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/postgres:12.4-alpine"
 , xrefcheck =
-    "dkhamsing/awesome_bot@sha256:a8adaeb3b3bd5745304743e4d8a6d512127646e420544a6d22d9f58a07f35884"
+    "europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/dkhamsing/awesome_bot:latest"
 , nixos = "gcr.io/o1labs-192920/nix-unstable:1.0.0"
 }
diff --git a/buildkite/src/Jobs/Test/RocksDBLedgerTarCompatibilityTest.dhall b/buildkite/src/Jobs/Test/RocksDBLedgerTarCompatibilityTest.dhall
@@ -47,7 +47,10 @@ in  Pipeline.build
             , label = "Check RocksDB Ledger Tar Compatibility"
             , key = "test"
             , target = Size.Multi
-            , docker = Some Docker::{ image = "ubuntu:noble" }
+            , docker = Some Docker::{
+              , image =
+                  "europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/ubuntu:noble"
+              }
             }
         ]
       }
diff --git a/buildkite/src/README.md b/buildkite/src/README.md
@@ -26,7 +26,7 @@ steps:
           - "BUILDKITE_PIPELINE_MODE=PullRequest"
           - "BUILDKITE_PIPELINE_STAGE=Test"
           - "BUILDKITE_PIPELINE_FILTER=AllTests"
-        image: codaprotocol/ci-toolchain-base:v3
+        image: europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/codaprotocol/ci-toolchain-base:v3
         mount-buildkite-agent: true
         propagate-environment: true
 
@@ -137,7 +137,7 @@ steps:
           - "CODENAMES=Focal,Bullseye"
           - "FROM_CHANNEL=Unstable"
           - "TO_CHANNEL=Experimental"
-        image: codaprotocol/ci-toolchain-base:v3
+        image: europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/codaprotocol/ci-toolchain-base:v3
         mount-buildkite-agent: true
         propagate-environment: true
 ```
diff --git a/dockerfiles/Dockerfile-mina-archive b/dockerfiles/Dockerfile-mina-archive
@@ -1,4 +1,4 @@
-ARG image=debian:bullseye-slim
+ARG image=europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/debian:bullseye-slim
 FROM ${image}
 
 # Run with `docker build --build-arg deb_version=<version>`
diff --git a/dockerfiles/Dockerfile-mina-daemon b/dockerfiles/Dockerfile-mina-daemon
@@ -1,4 +1,4 @@
-ARG image=debian:bullseye-slim
+ARG image=europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/debian:bullseye-slim
 FROM ${image}
 # Run with `docker build --build-arg deb_version=<version>`
 ARG deb_version
diff --git a/dockerfiles/Dockerfile-mina-rosetta b/dockerfiles/Dockerfile-mina-rosetta
@@ -1,4 +1,4 @@
-ARG image=ubuntu:focal
+ARG image=europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/ubuntu:focal
 FROM ${image} AS production
 ARG deb_codename=focal
 ARG deb_version
diff --git a/dockerfiles/Dockerfile-txn-burst b/dockerfiles/Dockerfile-txn-burst
@@ -4,7 +4,7 @@
 #or directly run with:
 # docker run -v <local keypath>:/keys --entrypoint ./_build/default/src/app/batch_txn_tool/batch_txn_tool.exe txn_burst_util --num-txn-per-acct 10 --origin-sender-sk-path "/keys/<origin key path>" --origin-sender-sk-pw "some password" --returner-sk-path "/keys/<origin key path>" --returner-sk-pw "some password"
 
-ARG image=debian:bullseye-slim
+ARG image=europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/debian:bullseye-slim
 FROM ${image}
 
 ARG deb_version
diff --git a/dockerfiles/Dockerfile-zkapp-test-transaction b/dockerfiles/Dockerfile-zkapp-test-transaction
@@ -1,4 +1,4 @@
-ARG image=debian:bullseye-slim
+ARG image=europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/debian:bullseye-slim
 FROM ${image}
 
 # Run with `docker build --build-arg deb_version=<version>`
diff --git a/dockerfiles/stages/1-build-deps b/dockerfiles/stages/1-build-deps
@@ -2,8 +2,8 @@
 # The "build-deps" stage
 # - Installs all compilers/interpreters, tools, and OS packages on the given debian or ubuntu image
 #################################################################################################
-# Supports debian:bullseye-slim, and ubuntu:focal
-ARG image=ubuntu:focal
+# Supports europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/debian:bullseye-slim, and europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/ubuntu:focal
+ARG image=europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/ubuntu:focal
 # Use the image argument to select the base image for this stage
 # This allows us to use the same Dockerfile for different base images
 # This arg is defined here globally and does not need to be redefined in
diff --git a/scripts/docker/helper.sh b/scripts/docker/helper.sh
@@ -15,7 +15,7 @@ function export_base_image () {
         IMAGE="debian:${DEB_CODENAME##*=}-slim"
     ;;
     bookworm)
-        IMAGE="debian:bookworm"
+        IMAGE="europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/debian:bookworm"
     ;;
     esac
     export IMAGE="--build-arg image=${IMAGE}"
diff --git a/scripts/docker/setup_buildx.sh b/scripts/docker/setup_buildx.sh
@@ -109,7 +109,7 @@ if [[ "${INSTALL_BINFMT}" = "1" ]]; then
     exit 1
   }
 
-  # Smoke-test non-native arches using busybox where applicable
+  # Smoke-test non-native arches using europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/busybox:latest where applicable
   # Build map from arch -> platform string
   for a in "${_ARCHES[@]}"; do
     # Skip test for native arch
@@ -118,7 +118,7 @@ if [[ "${INSTALL_BINFMT}" = "1" ]]; then
     fi
     platform="linux/${a}"
     echo "[binfmt] Smoke test for ${platform} ..."
-    if docker run --rm --platform="$platform" busybox uname -m 2>/dev/null | grep -qiE 'aarch64|arm64|x86_64|amd64|ppc64le|s390x|riscv64'; then
+    if docker run --rm --platform="$platform" europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/busybox:latest uname -m 2>/dev/null | grep -qiE 'aarch64|arm64|x86_64|amd64|ppc64le|s390x|riscv64'; then
       echo "[binfmt] OK: ${platform} emulation working"
     else
       echo "[binfmt] WARNING: ${platform} smoke test did not confirm; emulation may still be fine depending on image availability" >&2

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,10 @@ in Pipeline.build`
`47`	`47`	`, label = "Check RocksDB Ledger Tar Compatibility"`
`48`	`48`	`, key = "test"`
`49`	`49`	`, target = Size.Multi`
`50`		`- , docker = Some Docker::{ image = "ubuntu:noble" }`
	`50`	`+ , docker = Some Docker::{`
	`51`	`+ , image =`
	`52`	`+ "europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/ubuntu:noble"`
	`53`	`+ }`
`51`	`54`	`}`
`52`	`55`	`]`
`53`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG image=debian:bullseye-slim`
	`1`	`+ARG image=europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/debian:bullseye-slim`
`2`	`2`	`FROM ${image}`
`3`	`3`
`4`	`4`	# Run with `docker build --build-arg deb_version=<version>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG image=ubuntu:focal`
	`1`	`+ARG image=europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo/ubuntu:focal`
`2`	`2`	`FROM ${image} AS production`
`3`	`3`	`ARG deb_codename=focal`
`4`	`4`	`ARG deb_version`