[ci] Upgrade to Alpine Linux 3.18 (#38414)

Upgrade to Alpine Linux  3.18

Closes #38414

PiperOrigin-RevId: 714079037
pull/38433/head
Pawan Bhardwaj 1 month ago committed by Copybara-Service
parent 89826d31d3
commit 6f10307d8b
  1. 2
      src/php/docker/alpine/Dockerfile
  2. 2
      templates/src/php/docker/alpine/Dockerfile.template
  3. 2
      templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template
  4. 2
      templates/tools/dockerfile/test/python_alpine_x64/Dockerfile.template
  5. 8
      tools/bazelify_tests/dockerimage_current_versions.bzl
  6. 2
      tools/dockerfile/distribtest/python_alpine_x64.current_version
  7. 2
      tools/dockerfile/distribtest/python_alpine_x64/Dockerfile
  8. 1
      tools/dockerfile/distribtest/python_dev_alpine3.18_x64.current_version
  9. 2
      tools/dockerfile/distribtest/python_dev_alpine3.18_x64/Dockerfile
  10. 1
      tools/dockerfile/distribtest/python_dev_alpine3.7_x64.current_version
  11. 2
      tools/dockerfile/test/cxx_alpine_x64.current_version
  12. 2
      tools/dockerfile/test/cxx_alpine_x64/Dockerfile
  13. 2
      tools/dockerfile/test/python_alpine_x64.current_version
  14. 2
      tools/dockerfile/test/python_alpine_x64/Dockerfile
  15. 2
      tools/run_tests/artifacts/distribtest_targets.py
  16. 2
      tools/run_tests/run_tests.py

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM php:8.1-alpine3.15
FROM php:8.1-alpine3.18
RUN apk add autoconf g++ make zlib-dev git bash wget linux-headers

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM php:${settings.php_version.php_current_version()}-alpine3.15
FROM php:${settings.php_version.php_current_version()}-alpine3.18
RUN apk add autoconf g++ make zlib-dev git bash wget linux-headers

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.17
FROM alpine:3.18
# Install Git and basic packages.
RUN apk update && apk add ${'\\'}

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.17
FROM alpine:3.18
# Install Git and basic packages.
RUN apk update && apk add \

@ -36,12 +36,12 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
"tools/dockerfile/distribtest/csharp_dotnet5_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_dotnet5_x64@sha256:004e02902825b54c7f0d60eaed0819acf6f10c24853bf8f793001114e9969abd",
"tools/dockerfile/distribtest/csharp_ubuntu2204_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_ubuntu2204_x64@sha256:a439f2ccbc666f231e511a8e58eb7f66a3de4820a4d5aded1e62275cf8ac49f0",
"tools/dockerfile/distribtest/php8_debian12_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php8_debian12_x64@sha256:42399d061f234ee0ef79b333555db0e11ca4f106bb1d49276abf99c459c104f0",
"tools/dockerfile/distribtest/python_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64@sha256:d7232ef55c81d125b66899b908668156638cd2cfc5b119083eceacb6018da7e4",
"tools/dockerfile/distribtest/python_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64@sha256:1bbc6fa5b4b650d3037d089e164d364e05a6daf1ed6dd1025ba07cc127f73d7d",
"tools/dockerfile/distribtest/python_arch_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_arch_x64@sha256:2c1adadeb010e107132cf5137f32a2d18727796631245b110cc74f69c07502e1",
"tools/dockerfile/distribtest/python_bullseye_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_bullseye_x64@sha256:80553398f0c59c1dc186052f4f2deaf18fea582f6d1d166eec6ea298639031fb",
"tools/dockerfile/distribtest/python_bullseye_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_bullseye_x86@sha256:81300aed2bb5e6b3f9bf9f23ba751e884e0317a9cd79659d37cdef4f1cfd24ca",
"tools/dockerfile/distribtest/python_centos7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_centos7_x64@sha256:13d8f3ae273ac7dab9b5d486ca08045f6ded866c405ed7bb9d2c87574c1b911b",
"tools/dockerfile/distribtest/python_dev_alpine3.7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_alpine3.7_x64@sha256:c2e80c14210502795712f611c541870bbe80b307ff6cc732a82d3e0c6c1237cb",
"tools/dockerfile/distribtest/python_dev_alpine3.18_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_alpine3.18_x64@sha256:3ac23840cea2a761ac104ef749b43fa652966eba96c0cbe4c8cbac58513a8099",
"tools/dockerfile/distribtest/python_dev_arch_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_arch_x64@sha256:29f179ef2083ee6addd57e90f58781fdc1cb5dc3dd3e228da1af38785b921f35",
"tools/dockerfile/distribtest/python_dev_bullseye_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_bullseye_x64@sha256:6c15bd5c350dbc206f45fb512418db51db9a3b73cc304d1d28f4df38bad5a702",
"tools/dockerfile/distribtest/python_dev_bullseye_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_bullseye_x86@sha256:0cbb08f31a9d45ccdc41a88e409b215cac69cc1a9b05f456ebd96b398fd8e9ee",
@ -92,7 +92,7 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
"tools/dockerfile/test/bazel_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/bazel_arm64@sha256:2728d010d87cb1845d002efbc3d08dadc283e8d0b7e0b582c2623960af61d2c5",
"tools/dockerfile/test/csharp_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_arm64@sha256:4d4bc5f15e03f3d3d8fd889670ecde2c66a2e4d2dd9db80733c05c1d90c8a248",
"tools/dockerfile/test/csharp_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_x64@sha256:0763d919b17b4cfe5b65aff3bf911c04e9e4d46d11649858742033facd9f534f",
"tools/dockerfile/test/cxx_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64@sha256:10587bea5d163bf5c34c6157ebd1863d22863d9d38bbaf5135ffc6fbf2b73004",
"tools/dockerfile/test/cxx_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64@sha256:f49643b001fde1559e1607fa2735230c0a2acf97fb854e3bd56fb9e1c419883d",
"tools/dockerfile/test/cxx_clang_19_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_19_x64@sha256:2b5e396dbb9ef751471eb5c5433cbf3e694616daf0e8f9df53f0933e7796de5d",
"tools/dockerfile/test/cxx_clang_7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_7_x64@sha256:b35f94648ada85aab9110dae0ebca594cd278672d4bbce38312cefa372952cae",
"tools/dockerfile/test/cxx_debian11_openssl102_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_debian11_openssl102_x64@sha256:477ae0da7ff7faa9cf195c0d32472fec4cf8b7325505c63e00b5c794c9a4b1a7",
@ -106,7 +106,7 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
"tools/dockerfile/test/php8_debian12_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php8_debian12_arm64@sha256:c220e72b415ad194a41cf5640fe360b9358df1dd34553c8d8e6bfd4a82e032b3",
"tools/dockerfile/test/php8_debian12_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php8_debian12_x64@sha256:18bf37f80415ce3ddd48261b0ef97b421a85646cc15bd21348e19b5fd7b191d6",
"tools/dockerfile/test/php8_zts_debian12_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/php8_zts_debian12_x64@sha256:911241a4e38046b603245d56a1ca9491e81990ca9dedb0671e41b15387e3d2ee",
"tools/dockerfile/test/python_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64@sha256:0a4e3c166fb676d85ea26d9fffec3858d59a2f243a3acc1c2f9bd293a590a98c",
"tools/dockerfile/test/python_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64@sha256:01e99e5dcee30255a4683ebd308b6484b5aa4624dd514fc7d83df5fd1a0144be",
"tools/dockerfile/test/python_debian11_default_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_arm64@sha256:fccca33a655c7aa89dd7ebd9492cbcc1f636bd2a004cd939d1982cfce3d68326",
"tools/dockerfile/test/python_debian11_default_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_debian11_default_x64@sha256:8beca964d6bbb80a8cb4c4628c25e9702b007c97113e74e589fa50c15000738d",
"tools/dockerfile/test/rbe_ubuntu2004.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/rbe_ubuntu2004@sha256:b3eb1a17b7b091e3c5648a803076b2c40601242ff91c04d55997af6641305f68",

@ -1 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64:1d7179a0b971f3f2d5431e3ecd32043697f6d76b@sha256:d7232ef55c81d125b66899b908668156638cd2cfc5b119083eceacb6018da7e4
us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64:f62c0e58421922b6fb6198f7021eda93bb2130db@sha256:1bbc6fa5b4b650d3037d089e164d364e05a6daf1ed6dd1025ba07cc127f73d7d

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM python:3.10-alpine3.17
FROM python:3.10-alpine3.18
# Our test infrastructure demands bash
RUN apk update && apk add bash

@ -0,0 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_alpine3.18_x64:67c720699bc67ddad996b45d9ee46dbcdd4bb949@sha256:3ac23840cea2a761ac104ef749b43fa652966eba96c0cbe4c8cbac58513a8099

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.17
FROM alpine:3.18
RUN apk add --update build-base linux-headers python3 python3-dev py3-pip

@ -1 +0,0 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_alpine3.7_x64:498c08930a1776e309bc452c51ef3e0f0d8d5583@sha256:c2e80c14210502795712f611c541870bbe80b307ff6cc732a82d3e0c6c1237cb

@ -1 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64:0806b6d19bc92699c32c4c8d6e293f44b05f6322@sha256:10587bea5d163bf5c34c6157ebd1863d22863d9d38bbaf5135ffc6fbf2b73004
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64:70acbfb2ce05c656eaa15ff4591aae52f00c15d2@sha256:f49643b001fde1559e1607fa2735230c0a2acf97fb854e3bd56fb9e1c419883d

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.17
FROM alpine:3.18
# Install Git and basic packages.
RUN apk update && apk add \

@ -1 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64:49f0e3830de77a1a4891ad944774dc6f758d8599@sha256:0a4e3c166fb676d85ea26d9fffec3858d59a2f243a3acc1c2f9bd293a590a98c
us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64:549cb26dd5532a0ac61cd3b912c3d9f96c9363de@sha256:01e99e5dcee30255a4683ebd308b6484b5aa4624dd514fc7d83df5fd1a0144be

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM alpine:3.17
FROM alpine:3.18
# Install Git and basic packages.
RUN apk update && apk add autoconf automake bash \

@ -462,7 +462,7 @@ def targets():
"linux", "aarch64", "python38_buster", presubmit=True
),
PythonDistribTest(
"linux", "x64", "alpine3.7", source=True, presubmit=True
"linux", "x64", "alpine3.18", source=True, presubmit=True
),
PythonDistribTest(
"linux", "x64", "bullseye", source=True, presubmit=True

@ -895,7 +895,7 @@ class PythonLanguage(object):
elif args.compiler == "pypy3":
return (pypy32_config,)
elif args.compiler == "python_alpine":
return (python310_config,)
return (python311_config,)
elif args.compiler == "all_the_cpythons":
return (
python38_config,

Loading…
Cancel
Save