From f9fdab56571feee205c591ffd4da62f3238f4e52 Mon Sep 17 00:00:00 2001 From: Eugene Ostroukhov Date: Thu, 22 Aug 2024 09:51:33 -0700 Subject: [PATCH] [ci] Update alpine in 2 more images (#37539) Closes #37539 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37539 from eugeneo:alpine-update dc230dcc36a4a58755e783586455f8f7598c6e66 PiperOrigin-RevId: 666388258 --- .../dockerfile/test/cxx_alpine_x64/Dockerfile.template | 3 ++- .../dockerfile/test/python_alpine_x64/Dockerfile.template | 5 ++--- tools/dockerfile/test/cxx_alpine_x64.current_version | 2 +- tools/dockerfile/test/cxx_alpine_x64/Dockerfile | 3 ++- tools/dockerfile/test/python_alpine_x64.current_version | 2 +- tools/dockerfile/test/python_alpine_x64/Dockerfile | 7 +++---- tools/run_tests/run_tests.py | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template index 684eef015db..cfefb7e0279 100644 --- a/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_alpine_x64/Dockerfile.template @@ -14,12 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. - FROM alpine:3.15 + FROM alpine:3.17 # Install Git and basic packages. RUN apk update && apk add ${'\\'} autoconf ${'\\'} automake ${'\\'} + bash ${'\\'} bzip2 ${'\\'} build-base ${'\\'} cmake ${'\\'} diff --git a/templates/tools/dockerfile/test/python_alpine_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_alpine_x64/Dockerfile.template index 16c19cc3ad5..c2e4298aa3c 100644 --- a/templates/tools/dockerfile/test/python_alpine_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_alpine_x64/Dockerfile.template @@ -14,12 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. - FROM alpine:3.15 + FROM alpine:3.17 # Install Git and basic packages. RUN apk update && apk add \ autoconf \ automake \ + bash ${'\\'} bzip2 \ build-base \ cmake \ @@ -40,8 +41,6 @@ <%include file="../../git_avoid_dubious_ownership_error.include"/> - RUN ln -s /usr/bin/python3 /usr/bin/python - # Install Python packages from PyPI RUN python3 -m pip install --upgrade pip==19.3.1 diff --git a/tools/dockerfile/test/cxx_alpine_x64.current_version b/tools/dockerfile/test/cxx_alpine_x64.current_version index 05cf2895d09..147481bdfc9 100644 --- a/tools/dockerfile/test/cxx_alpine_x64.current_version +++ b/tools/dockerfile/test/cxx_alpine_x64.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64:e515716fa53187d8eaa9d2cb606e9f6cb1d21393@sha256:5beda19bcf186b6c9606f4265e38c99bb4308f25bc0987e0fc15164f3c205232 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64:0806b6d19bc92699c32c4c8d6e293f44b05f6322@sha256:10587bea5d163bf5c34c6157ebd1863d22863d9d38bbaf5135ffc6fbf2b73004 \ No newline at end of file diff --git a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile index 5fa24a52fde..8a4cb96aa79 100644 --- a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile @@ -12,12 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.15 +FROM alpine:3.17 # Install Git and basic packages. RUN apk update && apk add \ autoconf \ automake \ + bash \ bzip2 \ build-base \ cmake \ diff --git a/tools/dockerfile/test/python_alpine_x64.current_version b/tools/dockerfile/test/python_alpine_x64.current_version index 1e78d54944c..eb27db8aef0 100644 --- a/tools/dockerfile/test/python_alpine_x64.current_version +++ b/tools/dockerfile/test/python_alpine_x64.current_version @@ -1 +1 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64:6f340690c07d16a23deaa8b3270c634631ddd865@sha256:c541f0ce00ca542ed4ae86870b6b73c929227127c13e532d98a9afd28604b830 \ No newline at end of file +us-docker.pkg.dev/grpc-testing/testing-images-public/python_alpine_x64:49f0e3830de77a1a4891ad944774dc6f758d8599@sha256:0a4e3c166fb676d85ea26d9fffec3858d59a2f243a3acc1c2f9bd293a590a98c \ No newline at end of file diff --git a/tools/dockerfile/test/python_alpine_x64/Dockerfile b/tools/dockerfile/test/python_alpine_x64/Dockerfile index 4cdb814936e..44e06e340d5 100644 --- a/tools/dockerfile/test/python_alpine_x64/Dockerfile +++ b/tools/dockerfile/test/python_alpine_x64/Dockerfile @@ -12,10 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.15 +FROM alpine:3.17 # Install Git and basic packages. -RUN apk update && apk add autoconf automake bzip2 build-base cmake ccache curl gcc git libtool linux-headers make perl strace python3-dev py3-pip unzip wget zip +RUN apk update && apk add autoconf automake bash \ + bzip2 build-base cmake ccache curl gcc git libtool linux-headers make perl strace python3-dev py3-pip unzip wget zip #================= # Setup git to access working directory across docker boundary. @@ -26,8 +27,6 @@ RUN git config --global --add safe.directory '*' RUN git config --global protocol.file.allow always -RUN ln -s /usr/bin/python3 /usr/bin/python - # Install Python packages from PyPI RUN python3 -m pip install --upgrade pip==19.3.1 diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index e2150b19359..a663675eaec 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -885,7 +885,7 @@ class PythonLanguage(object): elif args.compiler == "pypy3": return (pypy32_config,) elif args.compiler == "python_alpine": - return (python39_config,) + return (python310_config,) elif args.compiler == "all_the_cpythons": return ( python38_config,