diff --git a/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template b/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template index e800038b2fc..4f9e42ec28f 100644 --- a/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template +++ b/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - FROM debian:bullseye + FROM debian:11 # Install clang-format RUN apt-get update && apt-get install -y clang-format-11 diff --git a/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template b/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template index 829bb4269db..bca4243459d 100644 --- a/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template +++ b/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - FROM debian:bullseye + FROM debian:11 # Install clang-tidy 11 RUN apt-get update && apt-get install -y clang-tidy-11 jq git diff --git a/templates/tools/dockerfile/grpc_iwyu/Dockerfile.template b/templates/tools/dockerfile/grpc_iwyu/Dockerfile.template index f31c4b658e2..58e12b7e678 100644 --- a/templates/tools/dockerfile/grpc_iwyu/Dockerfile.template +++ b/templates/tools/dockerfile/grpc_iwyu/Dockerfile.template @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - FROM debian:bullseye + FROM debian:11 RUN apt-get update && apt-get install -y clang-11 llvm-11-dev libclang-11-dev clang-format-11 jq git cmake python diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile.template index 0ab69691882..9a3695f07a4 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile.template @@ -22,4 +22,4 @@ <%include file="../../gcp_api_libraries.include"/> <%include file="../../cmake.include"/> - <%include file="../../ccache.include"/> \ No newline at end of file + <%include file="../../ccache.include"/> diff --git a/templates/tools/dockerfile/python_debian11_base.include b/templates/tools/dockerfile/python_debian11_base.include index 4f79aeca94b..45326589c8a 100644 --- a/templates/tools/dockerfile/python_debian11_base.include +++ b/templates/tools/dockerfile/python_debian11_base.include @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:11 <%include file="./apt_get_basic.include"/> <%include file="./run_tests_addons.include"/> diff --git a/tools/dockerfile/grpc_clang_format/Dockerfile b/tools/dockerfile/grpc_clang_format/Dockerfile index bb8979ed19a..e87523abd9f 100644 --- a/tools/dockerfile/grpc_clang_format/Dockerfile +++ b/tools/dockerfile/grpc_clang_format/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:bullseye +FROM debian:11 # Install clang-format RUN apt-get update && apt-get install -y clang-format-11 diff --git a/tools/dockerfile/grpc_clang_tidy/Dockerfile b/tools/dockerfile/grpc_clang_tidy/Dockerfile index 5797237cb9f..fb61cf514ce 100644 --- a/tools/dockerfile/grpc_clang_tidy/Dockerfile +++ b/tools/dockerfile/grpc_clang_tidy/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:bullseye +FROM debian:11 # Install clang-tidy 11 RUN apt-get update && apt-get install -y clang-tidy-11 jq git diff --git a/tools/dockerfile/grpc_iwyu/Dockerfile b/tools/dockerfile/grpc_iwyu/Dockerfile index c6b9a75b3b6..2bb0ac465da 100644 --- a/tools/dockerfile/grpc_iwyu/Dockerfile +++ b/tools/dockerfile/grpc_iwyu/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:bullseye +FROM debian:11 RUN apt-get update && apt-get install -y clang-11 llvm-11-dev libclang-11-dev clang-format-11 jq git cmake python diff --git a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile index b42fc13848c..ffab0474c6c 100644 --- a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:bullseye +FROM debian:11 #================= # Basic C core dependencies @@ -87,3 +87,4 @@ RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/downloa && make -j4 && make install \ && cd ../.. \ && rm -rf ccache-4.5.1 ccache.tar.gz + diff --git a/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile index 2b481570932..80825970cf0 100644 --- a/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:bullseye +FROM debian:11 #================= # Basic C core dependencies diff --git a/tools/dockerfile/test/python_debian11_default_x64/Dockerfile b/tools/dockerfile/test/python_debian11_default_x64/Dockerfile index ce2c88c5317..4c5da0a95a2 100644 --- a/tools/dockerfile/test/python_debian11_default_x64/Dockerfile +++ b/tools/dockerfile/test/python_debian11_default_x64/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:bullseye +FROM debian:11 #================= # Basic C core dependencies diff --git a/tools/internal_ci/helper_scripts/prepare_ccache_symlinks_rc b/tools/internal_ci/helper_scripts/prepare_ccache_symlinks_rc index 36e5a898f59..ec06363cec5 100644 --- a/tools/internal_ci/helper_scripts/prepare_ccache_symlinks_rc +++ b/tools/internal_ci/helper_scripts/prepare_ccache_symlinks_rc @@ -15,8 +15,7 @@ # Source this rc script to create symlinks to ccache -# TODO: handle values like "0", "false" etc. -if [ "${GRPC_BUILD_ENABLE_CCACHE}" != "" ] +if [ "${GRPC_BUILD_ENABLE_CCACHE}" != "" ] && [ "${GRPC_BUILD_ENABLE_CCACHE}" != "false" ] && [ "${GRPC_BUILD_ENABLE_CCACHE}" != "0" ] then if [ -x "$(command -v ccache)" ] then diff --git a/tools/internal_ci/linux/grpc_distribtests_csharp.sh b/tools/internal_ci/linux/grpc_distribtests_csharp.sh index 9c4f710ddda..011d62d26da 100755 --- a/tools/internal_ci/linux/grpc_distribtests_csharp.sh +++ b/tools/internal_ci/linux/grpc_distribtests_csharp.sh @@ -28,6 +28,9 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc # under qemu emulator. source tools/internal_ci/helper_scripts/prepare_qemu_rc +# configure ccache +source tools/internal_ci/helper_scripts/prepare_ccache_rc + # Build all C# linux artifacts tools/run_tests/task_runner.py -f artifact linux csharp ${TASK_RUNNER_EXTRA_FILTERS} -j 4 --inner_jobs 8 -x build_artifacts_csharp/sponge_log.xml || FAILED="true" diff --git a/tools/internal_ci/linux/grpc_distribtests_ruby.sh b/tools/internal_ci/linux/grpc_distribtests_ruby.sh index be73cdd3071..d91174430e7 100755 --- a/tools/internal_ci/linux/grpc_distribtests_ruby.sh +++ b/tools/internal_ci/linux/grpc_distribtests_ruby.sh @@ -26,6 +26,9 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc # prerequisites for ruby artifact build on linux source tools/internal_ci/helper_scripts/prepare_build_linux_ruby_artifact_rc +# configure ccache +source tools/internal_ci/helper_scripts/prepare_ccache_rc + # Build all ruby linux artifacts (this step actually builds all the binary wheels and source archives) tools/run_tests/task_runner.py -f artifact linux ruby ${TASK_RUNNER_EXTRA_FILTERS} -j 6 --inner_jobs 6 -x build_artifacts/sponge_log.xml || FAILED="true"