From f95aafde6c9abcedad2595a60a247f6bb3b2af03 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Thu, 12 Jan 2023 16:08:37 -0800 Subject: [PATCH] Migrate docker images to the new Artifact Registry location. PiperOrigin-RevId: 501691973 --- build_defs/cpp_opts.bzl | 2 ++ build_defs/upb.patch | 11 +++++++++++ kokoro/linux/32-bit/build.sh | 5 ++++- kokoro/linux/bazel.sh | 6 +++++- kokoro/linux/bazel/common.cfg | 2 +- kokoro/linux/cmake/build.sh | 5 ++++- kokoro/linux/cmake_install/build.sh | 5 ++++- kokoro/linux/cmake_ninja/build.sh | 5 ++++- kokoro/linux/cmake_shared/build.sh | 5 ++++- kokoro/linux/cpp_aarch64/common.cfg | 2 +- kokoro/linux/cpp_tcmalloc/common.cfg | 2 +- kokoro/linux/csharp/common.cfg | 2 +- kokoro/linux/java_aarch64/common.cfg | 2 +- kokoro/linux/java_jdk17/common.cfg | 2 +- kokoro/linux/jruby92/common.cfg | 2 +- kokoro/linux/jruby93/common.cfg | 2 +- kokoro/linux/php_all/build.sh | 16 +++++++++------- kokoro/linux/python310/common.cfg | 2 +- kokoro/linux/python310_cpp/common.cfg | 2 +- kokoro/linux/python37/common.cfg | 2 +- kokoro/linux/python37_cpp/common.cfg | 2 +- kokoro/linux/python38/common.cfg | 2 +- kokoro/linux/python38_cpp/common.cfg | 2 +- kokoro/linux/python39/common.cfg | 2 +- kokoro/linux/python39_cpp/common.cfg | 2 +- kokoro/linux/python_aarch64/common.cfg | 2 +- kokoro/linux/ruby26/common.cfg | 2 +- kokoro/linux/ruby27/common.cfg | 2 +- kokoro/linux/ruby30/common.cfg | 2 +- kokoro/linux/ruby31/common.cfg | 2 +- kokoro/release/protoc/build-protoc.sh | 4 +++- protobuf_deps.bzl | 1 + 32 files changed, 72 insertions(+), 35 deletions(-) create mode 100644 build_defs/upb.patch diff --git a/build_defs/cpp_opts.bzl b/build_defs/cpp_opts.bzl index 912c19b3c06d..6da9b4ef7af9 100644 --- a/build_defs/cpp_opts.bzl +++ b/build_defs/cpp_opts.bzl @@ -20,6 +20,8 @@ COPTS = select({ "-Woverloaded-virtual", "-Wno-sign-compare", "-Werror", + # TODO(b/265232445) This is required due to https://github.com/abseil/abseil-cpp/issues/1201. + "-Wno-deprecated", ], }) diff --git a/build_defs/upb.patch b/build_defs/upb.patch new file mode 100644 index 000000000000..0a9cb28f87ba --- /dev/null +++ b/build_defs/upb.patch @@ -0,0 +1,11 @@ +--- bazel/build_defs.bzl ++++ bazel/build_defs.bzl +@@ -33,6 +33,8 @@ _DEFAULT_CPPOPTS.extend([ + "-Wextra", + # "-Wshorten-64-to-32", # not in GCC (and my Kokoro images doesn't have Clang) + "-Werror", ++ # TODO(b/265232445) This is required due to https://github.com/abseil/abseil-cpp/issues/1201. ++ "-Wno-deprecated", + "-Wno-unused-parameter", + "-Wno-long-long", + ]) diff --git a/kokoro/linux/32-bit/build.sh b/kokoro/linux/32-bit/build.sh index 65903006ec97..5966f5c50e1c 100755 --- a/kokoro/linux/32-bit/build.sh +++ b/kokoro/linux/32-bit/build.sh @@ -12,13 +12,16 @@ set -ex cd $(dirname $0)/../../.. GIT_REPO_ROOT=$(pwd) -CONTAINER_IMAGE=gcr.io/protobuf-build/php/32bit@sha256:8c3cf171ac8a3f91296517d822a26b1cbb6696035bdb723db68928d52bdbfc40 +CONTAINER_IMAGE=us-docker.pkg.dev/protobuf-build/containers/test/linux/32bit@sha256:6651a299483f7368876db7aed0802ad4ebf038d626d8995ba7df08978ff43210 git submodule update --init --recursive use_bazel.sh 5.1.1 sudo ./kokoro/common/setup_kokoro_environment.sh ./regenerate_stale_files.sh +gcloud components update --quiet +gcloud auth configure-docker us-docker.pkg.dev --quiet + docker run \ "$@" \ -v $GIT_REPO_ROOT:/workspace \ diff --git a/kokoro/linux/bazel.sh b/kokoro/linux/bazel.sh index 9f1656978e0b..54f54b7f30c5 100755 --- a/kokoro/linux/bazel.sh +++ b/kokoro/linux/bazel.sh @@ -3,7 +3,7 @@ set -ex if [[ -z "${CONTAINER_IMAGE}" ]]; then - CONTAINER_IMAGE=gcr.io/protobuf-build/bazel/linux@sha256:2bfd061284eff8234f2fcca16d71d43c69ccf3a22206628b54c204a6a9aac277 + CONTAINER_IMAGE=us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:5.1.1-aec4d74f2eb6938fc53ef7d9a79a4bf2da24abc1 fi cd $(dirname $0)/../.. @@ -24,6 +24,10 @@ if [ -n "$BAZEL_ENV" ]; then done fi +# Setup GAR for docker images. +gcloud components update --quiet +gcloud auth configure-docker us-docker.pkg.dev --quiet + function run { local CONFIG=$1 local BAZEL_CONFIG=$2 diff --git a/kokoro/linux/bazel/common.cfg b/kokoro/linux/bazel/common.cfg index 667e9a2288e5..67a39f003619 100644 --- a/kokoro/linux/bazel/common.cfg +++ b/kokoro/linux/bazel/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/bazel/linux-san:b6bfa3bb505e83f062af0cb0ed23abf1e89b9edb" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize@sha256:dbd2f15fb69734d72c3fd10cb819bbe2ce4890acf49e9a2f9403983fe48e8807" } env_vars { diff --git a/kokoro/linux/cmake/build.sh b/kokoro/linux/cmake/build.sh index 67aea1b69854..e058add986b2 100755 --- a/kokoro/linux/cmake/build.sh +++ b/kokoro/linux/cmake/build.sh @@ -8,7 +8,7 @@ set -eux cd $(dirname $0)/../../.. GIT_REPO_ROOT=`pwd` -CONTAINER_IMAGE=gcr.io/protobuf-build/cmake/linux@sha256:bd17c13255c8c7af2821c6597ad96568d714c0ea9d9e27d81b108fcc195ca858 +CONTAINER_IMAGE=us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:cc23dbe065668158ca2732aa305a07bd0913a175b2079d27d9c16925d23f2335 # Update git submodules and regenerate files git submodule update --init --recursive @@ -18,6 +18,9 @@ sudo ./kokoro/common/setup_kokoro_environment.sh tmpfile=$(mktemp -u) +gcloud components update --quiet +gcloud auth configure-docker us-docker.pkg.dev --quiet + docker run \ --cidfile $tmpfile \ -v $GIT_REPO_ROOT:/workspace \ diff --git a/kokoro/linux/cmake_install/build.sh b/kokoro/linux/cmake_install/build.sh index bdd7ae6818f1..ea74c715daef 100755 --- a/kokoro/linux/cmake_install/build.sh +++ b/kokoro/linux/cmake_install/build.sh @@ -8,7 +8,7 @@ set -eux cd $(dirname $0)/../../.. GIT_REPO_ROOT=`pwd` -CONTAINER_IMAGE=gcr.io/protobuf-build/cmake/linux@sha256:bd17c13255c8c7af2821c6597ad96568d714c0ea9d9e27d81b108fcc195ca858 +CONTAINER_IMAGE=us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:cc23dbe065668158ca2732aa305a07bd0913a175b2079d27d9c16925d23f2335 # Update git submodules and regenerate files git submodule update --init --recursive @@ -18,6 +18,9 @@ sudo ./kokoro/common/setup_kokoro_environment.sh tmpfile=$(mktemp -u) +gcloud components update --quiet +gcloud auth configure-docker us-docker.pkg.dev --quiet + docker run \ --cidfile $tmpfile \ -v $GIT_REPO_ROOT:/workspace \ diff --git a/kokoro/linux/cmake_ninja/build.sh b/kokoro/linux/cmake_ninja/build.sh index 6ee3c6111473..1bb2c5a11f57 100755 --- a/kokoro/linux/cmake_ninja/build.sh +++ b/kokoro/linux/cmake_ninja/build.sh @@ -8,7 +8,7 @@ set -eux cd $(dirname $0)/../../.. GIT_REPO_ROOT=`pwd` -CONTAINER_IMAGE=gcr.io/protobuf-build/cmake/linux@sha256:bd17c13255c8c7af2821c6597ad96568d714c0ea9d9e27d81b108fcc195ca858 +CONTAINER_IMAGE=us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:cc23dbe065668158ca2732aa305a07bd0913a175b2079d27d9c16925d23f2335 # Update git submodules and regenerate files git submodule update --init --recursive @@ -18,6 +18,9 @@ sudo ./kokoro/common/setup_kokoro_environment.sh tmpfile=$(mktemp -u) +gcloud components update --quiet +gcloud auth configure-docker us-docker.pkg.dev --quiet + docker run \ --cidfile $tmpfile \ -v $GIT_REPO_ROOT:/workspace \ diff --git a/kokoro/linux/cmake_shared/build.sh b/kokoro/linux/cmake_shared/build.sh index 22369261e323..ee4ee8d71782 100755 --- a/kokoro/linux/cmake_shared/build.sh +++ b/kokoro/linux/cmake_shared/build.sh @@ -8,7 +8,7 @@ set -eux cd $(dirname $0)/../../.. GIT_REPO_ROOT=`pwd` -CONTAINER_IMAGE=gcr.io/protobuf-build/cmake/linux@sha256:bd17c13255c8c7af2821c6597ad96568d714c0ea9d9e27d81b108fcc195ca858 +CONTAINER_IMAGE=us-docker.pkg.dev/protobuf-build/containers/test/linux/cmake@sha256:cc23dbe065668158ca2732aa305a07bd0913a175b2079d27d9c16925d23f2335 # Update git submodules and regenerate files git submodule update --init --recursive @@ -18,6 +18,9 @@ sudo ./kokoro/common/setup_kokoro_environment.sh tmpfile=$(mktemp -u) +gcloud components update --quiet +gcloud auth configure-docker us-docker.pkg.dev --quiet + docker run \ --cidfile $tmpfile \ -v $GIT_REPO_ROOT:/workspace \ diff --git a/kokoro/linux/cpp_aarch64/common.cfg b/kokoro/linux/cpp_aarch64/common.cfg index 4b38c2c71812..9df4776b8b14 100644 --- a/kokoro/linux/cpp_aarch64/common.cfg +++ b/kokoro/linux/cpp_aarch64/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/emulation/linux:aarch64-8c600b1add46ab66e9cb15b893be175fe464dcbb" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-e863f8ec6b1dfe41f7dc573bac9c8072a0a68b1b" } env_vars { diff --git a/kokoro/linux/cpp_tcmalloc/common.cfg b/kokoro/linux/cpp_tcmalloc/common.cfg index fb76204e906e..f893ebb1af84 100644 --- a/kokoro/linux/cpp_tcmalloc/common.cfg +++ b/kokoro/linux/cpp_tcmalloc/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 1440 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/tcmalloc/linux:64e8944e4f18d7d6c9649112a8a93be57e693cd8" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/tcmalloc@sha256:9d975616c3fd44d5a091aeb60ee94f37e22fb367d471d258fc18cb4a2387c943" } env_vars { diff --git a/kokoro/linux/csharp/common.cfg b/kokoro/linux/csharp/common.cfg index 2332c00dcea8..ffdf2553899a 100644 --- a/kokoro/linux/csharp/common.cfg +++ b/kokoro/linux/csharp/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 1440 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/csharp/linux:3.1.415-6.0.100-6bbe70439ba5b0404bb12662cebc0296909389fa" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/csharp:3.1.415-6.0.100-65526ea124d1034eac33e7c37cc6d65c5bef054f" } env_vars { diff --git a/kokoro/linux/java_aarch64/common.cfg b/kokoro/linux/java_aarch64/common.cfg index 9879e7b29c84..ba5cf7b4ff37 100644 --- a/kokoro/linux/java_aarch64/common.cfg +++ b/kokoro/linux/java_aarch64/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/emulation/linux:aarch64-8c600b1add46ab66e9cb15b893be175fe464dcbb" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-e863f8ec6b1dfe41f7dc573bac9c8072a0a68b1b" } env_vars { diff --git a/kokoro/linux/java_jdk17/common.cfg b/kokoro/linux/java_jdk17/common.cfg index cd31eda40558..3fe9d4237abf 100644 --- a/kokoro/linux/java_jdk17/common.cfg +++ b/kokoro/linux/java_jdk17/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/java/linux:17-64e8944e4f18d7d6c9649112a8a93be57e693cd8" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/java:17-65526ea124d1034eac33e7c37cc6d65c5bef054f" } env_vars { diff --git a/kokoro/linux/jruby92/common.cfg b/kokoro/linux/jruby92/common.cfg index 797011c4822c..ce68afd7bbb3 100644 --- a/kokoro/linux/jruby92/common.cfg +++ b/kokoro/linux/jruby92/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-6fe0cedf2f7f54867de2c3a64f93c85661c9f8a4" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:jruby-9.2.20.1-6a70afd15ae4a98dd13fa777dbc519025d5d18d0" } env_vars { diff --git a/kokoro/linux/jruby93/common.cfg b/kokoro/linux/jruby93/common.cfg index 8b70724c9fcb..4635a98c37ad 100644 --- a/kokoro/linux/jruby93/common.cfg +++ b/kokoro/linux/jruby93/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-6fe0cedf2f7f54867de2c3a64f93c85661c9f8a4" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:jruby-9.3.4.0-6a70afd15ae4a98dd13fa777dbc519025d5d18d0" } env_vars { diff --git a/kokoro/linux/php_all/build.sh b/kokoro/linux/php_all/build.sh index bfad04c504b5..546359912cf6 100755 --- a/kokoro/linux/php_all/build.sh +++ b/kokoro/linux/php_all/build.sh @@ -8,16 +8,18 @@ set -ex # Change to repo base. cd $(dirname $0)/../../.. -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:8.0.5-dbg-fd99596d4c4c9b78f984ee667a9b26b91a28eb8d "composer test_valgrind" +gcloud components update --quiet +gcloud auth configure-docker us-docker.pkg.dev --quiet -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:7.0.33-dbg-fd99596d4c4c9b78f984ee667a9b26b91a28eb8d "composer test && composer test_c" -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:7.3.28-dbg-fd99596d4c4c9b78f984ee667a9b26b91a28eb8d "composer test && composer test_c" -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:7.4.18-dbg-fd99596d4c4c9b78f984ee667a9b26b91a28eb8d "composer test && composer test_c" -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:8.0.5-dbg-fd99596d4c4c9b78f984ee667a9b26b91a28eb8d "composer test && composer test_c" +docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:8.0.5-dbg-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test_valgrind" + +docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:7.3.28-dbg-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test && composer test_c" +docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:7.4.18-dbg-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test && composer test_c" +docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:8.0.5-dbg-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test && composer test_c" # Run specialized memory leak & multirequest tests. -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:8.0.5-dbg-fd99596d4c4c9b78f984ee667a9b26b91a28eb8d "composer test_c && tests/multirequest.sh && tests/memory_leak_test.sh" +docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:8.0.5-dbg-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test_c && tests/multirequest.sh && tests/memory_leak_test.sh" # Most of our tests use a debug build of PHP, but we do one build against an opt # php just in case that surfaces anything unexpected. -docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:8.0.5-fd99596d4c4c9b78f984ee667a9b26b91a28eb8d "composer test && composer test_c" +docker run $(test -t 0 && echo "-it") -v$PWD:/workspace us-docker.pkg.dev/protobuf-build/containers/test/linux/php:8.0.5-86edd58c4f987dda7d090d4eca8ac17170353553 "composer test && composer test_c" diff --git a/kokoro/linux/python310/common.cfg b/kokoro/linux/python310/common.cfg index a6fd200e07be..893f684ecf6c 100644 --- a/kokoro/linux/python310/common.cfg +++ b/kokoro/linux/python310/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/python:3.10-65526ea124d1034eac33e7c37cc6d65c5bef054f" } env_vars { diff --git a/kokoro/linux/python310_cpp/common.cfg b/kokoro/linux/python310_cpp/common.cfg index d1861632fa51..5e092f431908 100644 --- a/kokoro/linux/python310_cpp/common.cfg +++ b/kokoro/linux/python310_cpp/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/python:3.10-65526ea124d1034eac33e7c37cc6d65c5bef054f" } env_vars { diff --git a/kokoro/linux/python37/common.cfg b/kokoro/linux/python37/common.cfg index 101bce49d58e..9bb915789fc1 100644 --- a/kokoro/linux/python37/common.cfg +++ b/kokoro/linux/python37/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/python:3.7-65526ea124d1034eac33e7c37cc6d65c5bef054f" } env_vars { diff --git a/kokoro/linux/python37_cpp/common.cfg b/kokoro/linux/python37_cpp/common.cfg index d35be2082526..1fe98af39a53 100644 --- a/kokoro/linux/python37_cpp/common.cfg +++ b/kokoro/linux/python37_cpp/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/python:3.7-65526ea124d1034eac33e7c37cc6d65c5bef054f" } env_vars { diff --git a/kokoro/linux/python38/common.cfg b/kokoro/linux/python38/common.cfg index ee158922eb9e..0424aca20d54 100644 --- a/kokoro/linux/python38/common.cfg +++ b/kokoro/linux/python38/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/python:3.8-65526ea124d1034eac33e7c37cc6d65c5bef054f" } env_vars { diff --git a/kokoro/linux/python38_cpp/common.cfg b/kokoro/linux/python38_cpp/common.cfg index f641b8c3a237..c6a959855d2c 100644 --- a/kokoro/linux/python38_cpp/common.cfg +++ b/kokoro/linux/python38_cpp/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/python:3.8-65526ea124d1034eac33e7c37cc6d65c5bef054f" } env_vars { diff --git a/kokoro/linux/python39/common.cfg b/kokoro/linux/python39/common.cfg index af53e389f3bd..4c28c1e45924 100644 --- a/kokoro/linux/python39/common.cfg +++ b/kokoro/linux/python39/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/python:3.9-65526ea124d1034eac33e7c37cc6d65c5bef054f" } env_vars { diff --git a/kokoro/linux/python39_cpp/common.cfg b/kokoro/linux/python39_cpp/common.cfg index e0393109acf0..387b9bcdf5db 100644 --- a/kokoro/linux/python39_cpp/common.cfg +++ b/kokoro/linux/python39_cpp/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/python:3.9-65526ea124d1034eac33e7c37cc6d65c5bef054f" } env_vars { diff --git a/kokoro/linux/python_aarch64/common.cfg b/kokoro/linux/python_aarch64/common.cfg index 0b636da72af5..6ad9c06b41f1 100644 --- a/kokoro/linux/python_aarch64/common.cfg +++ b/kokoro/linux/python_aarch64/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/emulation/linux:aarch64-8c600b1add46ab66e9cb15b893be175fe464dcbb" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-e863f8ec6b1dfe41f7dc573bac9c8072a0a68b1b" } env_vars { diff --git a/kokoro/linux/ruby26/common.cfg b/kokoro/linux/ruby26/common.cfg index 7db151c2d929..11d35f3b5f75 100644 --- a/kokoro/linux/ruby26/common.cfg +++ b/kokoro/linux/ruby26/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-6fe0cedf2f7f54867de2c3a64f93c85661c9f8a4" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:ruby-2.6.0-6a70afd15ae4a98dd13fa777dbc519025d5d18d0" } env_vars { diff --git a/kokoro/linux/ruby27/common.cfg b/kokoro/linux/ruby27/common.cfg index 0b4f2e3c0f7e..cc917ab39dfb 100644 --- a/kokoro/linux/ruby27/common.cfg +++ b/kokoro/linux/ruby27/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-6fe0cedf2f7f54867de2c3a64f93c85661c9f8a4" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:ruby-2.7.0-6a70afd15ae4a98dd13fa777dbc519025d5d18d0" } env_vars { diff --git a/kokoro/linux/ruby30/common.cfg b/kokoro/linux/ruby30/common.cfg index 04ff4bed290a..459f987e2cd4 100644 --- a/kokoro/linux/ruby30/common.cfg +++ b/kokoro/linux/ruby30/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-6fe0cedf2f7f54867de2c3a64f93c85661c9f8a4" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:ruby-3.0.2-6a70afd15ae4a98dd13fa777dbc519025d5d18d0" } env_vars { diff --git a/kokoro/linux/ruby31/common.cfg b/kokoro/linux/ruby31/common.cfg index 2de36aa439ba..f10e0a2fdbd9 100644 --- a/kokoro/linux/ruby31/common.cfg +++ b/kokoro/linux/ruby31/common.cfg @@ -6,7 +6,7 @@ timeout_mins: 120 env_vars { key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-6fe0cedf2f7f54867de2c3a64f93c85661c9f8a4" + value: "us-docker.pkg.dev/protobuf-build/containers/test/linux/ruby:ruby-3.1.0-6a70afd15ae4a98dd13fa777dbc519025d5d18d0" } env_vars { diff --git a/kokoro/release/protoc/build-protoc.sh b/kokoro/release/protoc/build-protoc.sh index c0785eee4a04..504eadc26939 100755 --- a/kokoro/release/protoc/build-protoc.sh +++ b/kokoro/release/protoc/build-protoc.sh @@ -230,7 +230,9 @@ cd "$(dirname "$0")" WORKING_DIR="$(pwd)" TARGET_FILE="target/$OS/$ARCH/$BAZEL_TARGET.exe" -DOCKER_IMAGE=gcr.io/protobuf-build/bazel/linux@sha256:2bfd061284eff8234f2fcca16d71d43c69ccf3a22206628b54c204a6a9aac277 +DOCKER_IMAGE=us-docker.pkg.dev/protobuf-build/release-containers/linux@sha256:85fd92cce31eb9446ca85d108b424b8167cea3469b58f2b9a9d30e37fc467a00 +gcloud components update --quiet +gcloud auth configure-docker us-docker.pkg.dev --quiet tmpfile=$(mktemp -u) && docker run --cidfile $tmpfile -v $WORKING_DIR/../../..:/workspace $DOCKER_IMAGE \ diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl index 289a3540db95..3527f790178e 100644 --- a/protobuf_deps.bzl +++ b/protobuf_deps.bzl @@ -152,4 +152,5 @@ def protobuf_deps(): repo = "https://github.com/protocolbuffers/upb", commit = "0c6b72dbf891eafc91050ad60733ea3022fac2b3", sha256 = "9c8cdfa013450548c9f03fac8e1390aeb21a75413f443790815b71d475c9af49", + patches = ["@com_google_protobuf//build_defs:upb.patch"], )