Update all Debian:9 to Debian:10 (grpc#31917)

matthewstevenson88 · Feb 1, 2024 · 8ef7dcb · 8ef7dcb
1 parent ae3fdc3
commit 8ef7dcb
Show file tree

Hide file tree

Showing 28 changed files with 113 additions and 88 deletions.
diff --git a/examples/android/helloworld/app/build.gradle b/examples/android/helloworld/app/build.gradle
@@ -2,9 +2,11 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
+    ndkVersion "25.1.8937393"
     defaultConfig {
         applicationId "io.grpc.android.cpp.helloworldexample"
         minSdkVersion 21
+        // noinspection ExpiredTargetSDKVersion
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"

diff --git a/examples/android/helloworld/build.gradle b/examples/android/helloworld/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.3-bin.zip
diff --git a/src/android/test/interop/app/build.gradle b/src/android/test/interop/app/build.gradle
@@ -2,9 +2,11 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
+    ndkVersion "25.1.8937393"
     defaultConfig {
         applicationId "io.grpc.android.interop.cpp"
         minSdkVersion 21
+        // noinspection ExpiredTargetSDKVersion
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"

diff --git a/src/android/test/interop/build.gradle b/src/android/test/interop/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/src/android/test/interop/gradle/wrapper/gradle-wrapper.properties b/src/android/test/interop/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.3-bin.zip
diff --git a/templates/tools/dockerfile/grpc_artifact_android_ndk/Dockerfile.template b/templates/tools/dockerfile/grpc_artifact_android_ndk/Dockerfile.template
@@ -14,15 +14,19 @@
   # See the License for the specific language governing permissions and
   # limitations under the License.
 
-  FROM debian:stretch
+  FROM debian:10
 
   <%include file="../apt_get_basic.include"/>
   <%include file="../run_tests_python_deps.include"/>
   <%include file="../cmake.include"/>
   <%include file="../run_tests_addons.include"/>
 
-  # Java required by Android SDK
-  RUN apt-get update && apt-get -y install openjdk-8-jdk && apt-get clean
+  # Java required by Android SDK (using Eclipse Temurin Package)
+  RUN apt install -y wget apt-transport-https && ${'\\'}
+      mkdir -p /etc/apt/keyrings && ${'\\'}
+      wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc && ${'\\'}
+      echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+  RUN apt update && apt install -y temurin-8-jdk
 
   # Install Android SDK
   ENV ANDROID_SDK_VERSION 4333796
@@ -39,6 +43,13 @@
   ENV ANDROID_NDK_PATH $ANDROID_SDK_PATH/ndk-bundle
   ENV ANDROID_SDK_CMAKE $ANDROID_SDK_PATH/cmake/3.6.4111459/bin/cmake
 
+  # Install gcloud
+  RUN curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-407.0.0-linux-x86_64.tar.gz && ${'\\'}
+      tar -xf google-cloud-cli-407.0.0-linux-x86_64.tar.gz && ${'\\'}
+      ./google-cloud-sdk/install.sh --bash-completion=false --path-update=true && ${'\\'}
+      rm -rf google-cloud-cli-407.0.0-linux-x86_64.tar.gz
+  RUN ln -s /google-cloud-sdk/bin/gcloud /usr/local/bin/gcloud
+
   # Define the default command.
   CMD ["bash"]
 
diff --git a/test/distrib/cpp/run_distrib_test_cmake_aarch64_cross.sh b/test/distrib/cpp/run_distrib_test_cmake_aarch64_cross.sh
@@ -48,8 +48,8 @@ cat > /tmp/toolchain.cmake <<'EOT'
 SET(CMAKE_SYSTEM_NAME Linux)
 SET(CMAKE_SYSTEM_PROCESSOR aarch64)
 set(CMAKE_STAGING_PREFIX /tmp/stage)
-set(CMAKE_C_COMPILER /usr/bin/aarch64-linux-gnu-gcc-6)
-set(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++-6)
+set(CMAKE_C_COMPILER /usr/bin/aarch64-linux-gnu-gcc-8)
+set(CMAKE_CXX_COMPILER /usr/bin/aarch64-linux-gnu-g++-8)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

diff --git a/tools/dockerfile/distribtest/cpp_debian10_aarch64_cross_x64.current_version b/tools/dockerfile/distribtest/cpp_debian10_aarch64_cross_x64.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian10_aarch64_cross_x64:3e47b89e6492db5a8a270263a30674cd45681b1c@sha256:15eeafcd816cb32a0d44da22f654749352a92fec9626dc028b39948897d5bea3
diff --git a/.../cpp_stretch_aarch64_cross_x64/Dockerfile → ...cpp_debian10_aarch64_cross_x64/Dockerfile b/.../cpp_stretch_aarch64_cross_x64/Dockerfile → ...cpp_debian10_aarch64_cross_x64/Dockerfile
@@ -12,18 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 # gRPC C++ dependencies based on https://github.com/grpc/grpc/blob/master/BUILDING.md
-RUN apt-get update && apt-get install -y build-essential autoconf libtool pkg-config && apt-get clean
-
-# debian stretch has cmake 3.7: https://packages.debian.org/stretch/cmake
-RUN apt-get update && apt-get install -y cmake && apt-get clean
+RUN apt-get update && apt-get install -y build-essential autoconf cmake libtool pkg-config && apt-get clean
 
 # C++ distribtests are setup in a way that requires git
 RUN apt-get update && apt-get install -y git && apt-get clean
 
 # aarch cross-compiler
-RUN apt-get update && apt-get install -y g++-6-aarch64-linux-gnu
+RUN apt-get update && apt-get install -y g++-8-aarch64-linux-gnu
+
+RUN git config --global --add safe.directory /var/local/jenkins/grpc
+RUN git config --global protocol.file.allow always
 
 CMD ["bash"]
diff --git a/tools/dockerfile/distribtest/cpp_debian10_x64.current_version b/tools/dockerfile/distribtest/cpp_debian10_x64.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian10_x64:f381d64b950388336fa44e1ab689770d643a6bcd@sha256:904e3db8521697768f94aa08230063b474246184e126f74a41b98a6f4aaf6a49
diff --git a/...le/distribtest/cpp_stretch_x64/Dockerfile → ...e/distribtest/cpp_debian10_x64/Dockerfile b/...le/distribtest/cpp_stretch_x64/Dockerfile → ...e/distribtest/cpp_debian10_x64/Dockerfile
@@ -12,15 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 # gRPC C++ dependencies based on https://github.com/grpc/grpc/blob/master/BUILDING.md
-RUN apt-get update && apt-get install -y build-essential autoconf libtool pkg-config && apt-get clean
-
-# debian stretch has cmake 3.7: https://packages.debian.org/stretch/cmake
-RUN apt-get update && apt-get install -y cmake && apt-get clean
+RUN apt-get update && apt-get install -y build-essential autoconf cmake libtool pkg-config && apt-get clean
 
 # C++ distribtests are setup in a way that requires git
 RUN apt-get update && apt-get install -y git && apt-get clean
 
+RUN git config --global --add safe.directory /var/local/jenkins/grpc
+RUN git config --global protocol.file.allow always
+
+
 CMD ["bash"]
diff --git a/tools/dockerfile/distribtest/csharp_debian10_x64.current_version b/tools/dockerfile/distribtest/csharp_debian10_x64.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian10_x64:0ebcec2f23bd9e270d100e58e7de954e714225ad@sha256:8c3838e731da70566adc6f989f2c29351fdb2f629e8797928699fff24b3a0938
diff --git a/tools/dockerfile/distribtest/csharp_debian10_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_debian10_x64/Dockerfile
@@ -0,0 +1,38 @@
+# Copyright 2019 The gRPC Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM debian:10
+
+RUN apt-get update && apt-get install -y apt-transport-https ca-certificates curl dirmngr gnupg unzip wget && apt-get clean
+
+# Install mono
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
+    && echo "deb https://download.mono-project.com/repo/debian stable-buster main" | tee /etc/apt/sources.list.d/mono-official-stable.list \
+    && apt-get update && apt-get install -y mono-devel nuget \
+    && apt-get clean
+
+# Install dotnet SDK
+RUN wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb \
+    && dpkg -i packages-microsoft-prod.deb \
+    && apt update \
+    && apt install -y dotnet-sdk-3.1 \
+    && apt-get clean
+
+# Make sure the mono certificate store is up-to-date to prevent issues with nuget restore
+RUN curl https://curl.haxx.se/ca/cacert.pem > ~/cacert.pem && cert-sync ~/cacert.pem && rm -f ~/cacert.pem
+
+# we have a separate distribtest for netcoreapp2.1
+ENV SKIP_NETCOREAPP21_DISTRIBTEST=1
+# we have a separate distribtest for net5.0
+ENV SKIP_NET50_DISTRIBTEST=1
diff --git a/tools/dockerfile/distribtest/csharp_stretch_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_stretch_x64/Dockerfile
diff --git a/tools/dockerfile/distribtest/php7_debian10_x64.current_version b/tools/dockerfile/distribtest/php7_debian10_x64.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/php7_debian10_x64:166cdf0033d2f6355ab8a679145b9ed1866be1de@sha256:e760a60f2dce2dada571d9b07447a9f99ffeeb366a309dbbb5dc0a43991c22dc
diff --git a/...e/distribtest/php7_stretch_x64/Dockerfile → .../distribtest/php7_debian10_x64/Dockerfile b/...e/distribtest/php7_stretch_x64/Dockerfile → .../distribtest/php7_debian10_x64/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 RUN apt-get update && apt-get install -y php php-dev php-pear wget zlib1g-dev
 

diff --git a/tools/dockerfile/distribtest/ruby_debian10_x64.current_version b/tools/dockerfile/distribtest/ruby_debian10_x64.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64:0efa3a484833ce2b8960ad449d62571a8d595f65@sha256:1298c39c950b2a48261555b6cff1ae66230a5020f100d3b381759285f0caf84e
diff --git a/...e/distribtest/ruby_stretch_x64/Dockerfile → .../distribtest/ruby_debian10_x64/Dockerfile b/...e/distribtest/ruby_stretch_x64/Dockerfile → .../distribtest/ruby_debian10_x64/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 RUN apt-get update && apt-get install -y ruby-full
 

diff --git a/tools/dockerfile/distribtest/ruby_debian10_x64_ruby_2_6.current_version b/tools/dockerfile/distribtest/ruby_debian10_x64_ruby_2_6.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64_ruby_2_6:49b4854d213d0219ae41d4cfe38192df26958aa8@sha256:3ef9a84a77276f2ccaca3c97336573f76ed02719645e4bb67ccdf1f33da99fc8
diff --git a/...test/ruby_stretch_x64_ruby_2_6/Dockerfile → ...est/ruby_debian10_x64_ruby_2_6/Dockerfile b/...test/ruby_stretch_x64_ruby_2_6/Dockerfile → ...est/ruby_debian10_x64_ruby_2_6/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \

diff --git a/tools/dockerfile/distribtest/ruby_debian10_x64_ruby_2_7.current_version b/tools/dockerfile/distribtest/ruby_debian10_x64_ruby_2_7.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64_ruby_2_7:9a09a0a915e62249957791eda907a011078c5aea@sha256:5ee26ad3abe2683c9a8ee03987ab0ae63f50793c3d3f5e4be6e6cbacb4556fcf
diff --git a/...test/ruby_stretch_x64_ruby_2_7/Dockerfile → ...est/ruby_debian10_x64_ruby_2_7/Dockerfile b/...test/ruby_stretch_x64_ruby_2_7/Dockerfile → ...est/ruby_debian10_x64_ruby_2_7/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \

diff --git a/tools/dockerfile/distribtest/ruby_debian10_x64_ruby_3_0.current_version b/tools/dockerfile/distribtest/ruby_debian10_x64_ruby_3_0.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64_ruby_3_0:c277dbca7dbd28ff6112cbc842ba3144c49266bd@sha256:9190da90a2a95eca1370cef64dcba7ddee9f59cc7487093da6711c1280a0b0f9
diff --git a/...test/ruby_stretch_x64_ruby_3_0/Dockerfile → ...est/ruby_debian10_x64_ruby_3_0/Dockerfile b/...test/ruby_stretch_x64_ruby_3_0/Dockerfile → ...est/ruby_debian10_x64_ruby_3_0/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 # Install Git and basic packages.
 RUN apt-get update && apt-get install -y \

diff --git a/tools/dockerfile/grpc_artifact_android_ndk/Dockerfile b/tools/dockerfile/grpc_artifact_android_ndk/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+FROM debian:10
 
 #=================
 # Basic C core dependencies
@@ -88,8 +88,12 @@ RUN apt-get update && apt-get install -y cmake && apt-get clean
 RUN mkdir /var/local/jenkins
 
 
-# Java required by Android SDK
-RUN apt-get update && apt-get -y install openjdk-8-jdk && apt-get clean
+# Java required by Android SDK (using Eclipse Temurin Package)
+RUN apt install -y wget apt-transport-https && \
+    mkdir -p /etc/apt/keyrings && \
+    wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc && \
+    echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+RUN apt update && apt install -y temurin-8-jdk
 
 # Install Android SDK
 ENV ANDROID_SDK_VERSION 4333796
@@ -103,5 +107,12 @@ RUN $ANDROID_SDK_PATH/tools/bin/sdkmanager ndk-bundle 'cmake;3.6.4111459'
 ENV ANDROID_NDK_PATH $ANDROID_SDK_PATH/ndk-bundle
 ENV ANDROID_SDK_CMAKE $ANDROID_SDK_PATH/cmake/3.6.4111459/bin/cmake
 
+# Install gcloud
+RUN curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-407.0.0-linux-x86_64.tar.gz && \
+    tar -xf google-cloud-cli-407.0.0-linux-x86_64.tar.gz && \
+    ./google-cloud-sdk/install.sh --bash-completion=false --path-update=true && \
+    rm -rf google-cloud-cli-407.0.0-linux-x86_64.tar.gz
+RUN ln -s /google-cloud-sdk/bin/gcloud /usr/local/bin/gcloud
+
 # Define the default command.
 CMD ["bash"]
diff --git a/tools/dockerfile/test/android_ndk.current_version b/tools/dockerfile/test/android_ndk.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/android_ndk:47e2befd3ceab97fa3e8ad5b8499b684380d624d@sha256:256ff2bb8fd6c6921cd7653f79fa495669c6466f78df96f71867f89f6d487ff3
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		us-docker.pkg.dev/grpc-testing/testing-images-public/cpp_debian10_aarch64_cross_x64:3e47b89e6492db5a8a270263a30674cd45681b1c@sha256:15eeafcd816cb32a0d44da22f654749352a92fec9626dc028b39948897d5bea3