From bd1eb96b5b5bc938cac54b66a9b3f4a8ee1eb42e Mon Sep 17 00:00:00 2001 From: AJ Heller Date: Wed, 3 Jan 2024 15:12:12 -0800 Subject: [test-infra] Update all Ubuntu docker images to v20.04 or newer (#35440) Closes #35440 PiperOrigin-RevId: 595515422 --- .../python_dev_ubuntu1804_x64.current_version | 1 - .../python_dev_ubuntu1804_x64/Dockerfile | 22 -------------- .../python_ubuntu1804_x64.current_version | 1 - .../distribtest/python_ubuntu1804_x64/Dockerfile | 19 ------------ .../ruby_ubuntu1804_x64.current_version | 1 - .../distribtest/ruby_ubuntu1804_x64/Dockerfile | 33 -------------------- .../ruby_ubuntu2004_x64.current_version | 1 + .../distribtest/ruby_ubuntu2004_x64/Dockerfile | 35 ++++++++++++++++++++++ 8 files changed, 36 insertions(+), 77 deletions(-) delete mode 100644 tools/dockerfile/distribtest/python_dev_ubuntu1804_x64.current_version delete mode 100644 tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile delete mode 100644 tools/dockerfile/distribtest/python_ubuntu1804_x64.current_version delete mode 100644 tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile delete mode 100644 tools/dockerfile/distribtest/ruby_ubuntu1804_x64.current_version delete mode 100644 tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile create mode 100644 tools/dockerfile/distribtest/ruby_ubuntu2004_x64.current_version create mode 100644 tools/dockerfile/distribtest/ruby_ubuntu2004_x64/Dockerfile (limited to 'tools/dockerfile') diff --git a/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64.current_version b/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64.current_version deleted file mode 100644 index b396834351..0000000000 --- a/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64.current_version +++ /dev/null @@ -1 +0,0 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_ubuntu1804_x64:483ff054a378bc704ae38ff1e1713947472c60d6@sha256:157a89cd6d0e69b89ac1975e0314aade556a35aafbaa5fe9f9890f90321d6c89 \ No newline at end of file diff --git a/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile b/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile deleted file mode 100644 index 8b15fdce2a..0000000000 --- a/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2020 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 ubuntu:18.04 - -RUN apt-get update -y && apt-get install -y python3 python3-pip - -RUN apt-get install -y build-essential -RUN apt-get install -y python3-dev - -RUN python3 -m pip install virtualenv diff --git a/tools/dockerfile/distribtest/python_ubuntu1804_x64.current_version b/tools/dockerfile/distribtest/python_ubuntu1804_x64.current_version deleted file mode 100644 index 3a0b031a69..0000000000 --- a/tools/dockerfile/distribtest/python_ubuntu1804_x64.current_version +++ /dev/null @@ -1 +0,0 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/python_ubuntu1804_x64:ee3ea8950f46d21ef06d3848294ae518c68f144f@sha256:edcd5f342d77ad9129cc0a0e6988b47b144815e7a93091d5b45e850111eefbcf \ No newline at end of file diff --git a/tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile b/tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile deleted file mode 100644 index 30337403d6..0000000000 --- a/tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 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 ubuntu:18.04 - -RUN apt-get update -y && apt-get install -y python3 python3-pip - -RUN python3 -m pip install virtualenv diff --git a/tools/dockerfile/distribtest/ruby_ubuntu1804_x64.current_version b/tools/dockerfile/distribtest/ruby_ubuntu1804_x64.current_version deleted file mode 100644 index a5daff2b3b..0000000000 --- a/tools/dockerfile/distribtest/ruby_ubuntu1804_x64.current_version +++ /dev/null @@ -1 +0,0 @@ -us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_ubuntu1804_x64:aca247e97f04a9cd5922a310337a4b5ee646fb9d@sha256:d38b3dd34cffc027e9a1bf82bc7ace75b8a9829c2d04d5cf7cc8323655edd27a \ No newline at end of file diff --git a/tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile deleted file mode 100644 index fa359aa95c..0000000000 --- a/tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2020 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 ubuntu:18.04 - -# Install Git and basic packages. -RUN apt-get update -y && apt-get install -y \ - curl \ - gnupg2 \ - gcc && apt-get clean - -# Install rvm -RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB -RUN \curl -sSL https://get.rvm.io | bash -s stable - -# Install Ruby 2.7 -RUN /bin/bash -l -c "rvm install ruby-2.7" -RUN /bin/bash -l -c "rvm use --default ruby-2.7" -RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc" -RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" -RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.7' >> ~/.bashrc" -RUN /bin/bash -l -c "gem install bundler --no-document" diff --git a/tools/dockerfile/distribtest/ruby_ubuntu2004_x64.current_version b/tools/dockerfile/distribtest/ruby_ubuntu2004_x64.current_version new file mode 100644 index 0000000000..e0f2026035 --- /dev/null +++ b/tools/dockerfile/distribtest/ruby_ubuntu2004_x64.current_version @@ -0,0 +1 @@ +us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_ubuntu2004_x64:41b5e3380e01ef6687e29071fedc6d9b90d96d09@sha256:426cbf625df0c0e7451b9716041996dc6a35a3788c1a24d68891256f84733d8e \ No newline at end of file diff --git a/tools/dockerfile/distribtest/ruby_ubuntu2004_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_ubuntu2004_x64/Dockerfile new file mode 100644 index 0000000000..f491661a57 --- /dev/null +++ b/tools/dockerfile/distribtest/ruby_ubuntu2004_x64/Dockerfile @@ -0,0 +1,35 @@ +# Copyright 2020 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 ubuntu:20.04 + +# Install Git and basic packages. +RUN apt-get update -y && apt-get install -y \ + curl \ + gnupg2 \ + gcc && apt-get clean + +# Install rvm +RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB +RUN \curl -sSL https://get.rvm.io | bash -s stable + +# Install Ruby 2.7 +RUN /bin/bash -l -c "rvm install ruby-2.7" +RUN /bin/bash -l -c "rvm use --default ruby-2.7" +RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc" +RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" +RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.7' >> ~/.bashrc" +# TODO(apolcyn): Bundler v2.4.22 is the last to support ruby 2.7. Latest bundler +# requires ruby 3. +RUN /bin/bash -l -c "gem install bundler --no-document -v 2.4.22" -- cgit v1.2.3