feat: Rebase on top of Ubuntu 20.04 (#221)

Author: dazuma

.gitignore

@@ -2,3 +2,4 @@
 /tmp
 /ruby-base/Dockerfile
 /ruby-prebuilt/Dockerfile
+/ruby-ubuntu*/Dockerfile

Gemfile.lock

@@ -18,4 +18,4 @@ DEPENDENCIES
   rake (~> 12.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.33

README.md

@@ -12,8 +12,8 @@ https://cloud.google.com/appengine/docs/flexible/ruby/
 
 This repository includes:
 
-* The base image atop Ubuntu 16_04, including the OS, common libraries and
-  build dependencies, NodeJS, and rbenv, in the `ruby-ubuntu16` directory.
+* The base image atop Ubuntu 20_04, including the OS, common libraries and
+  build dependencies, NodeJS, and rbenv, in the `ruby-ubuntu20` directory.
 * A Dockerfile and config for building Ruby binary images in the
   `ruby-prebuilt` directory.
 * A convenience image, including the above Ubuntu image and a default

Rakefile

@@ -20,9 +20,10 @@ BUNDLER2_VERSION="2.1.4"
 DEFAULT_RUBY_VERSION="2.7.6"
 NODEJS_VERSION="16.15.0"
 GCLOUD_VERSION="387.0.0"
-OS_NAME="ubuntu16"
+SSL10_VERSION="1.0.2n-1ubuntu5.9"
+OS_NAME="ubuntu20"
 
-LOCAL_PREBUILT_RUBY_VERSIONS=["2.6.10", "2.7.6", "3.0.4", "3.1.1"]
+LOCAL_PREBUILT_RUBY_VERSIONS=["2.6.10", "2.7.6", "3.0.4", "3.1.2"]
 LOCAL_PREBUILT_RUBY_IMAGE_BASE="ruby-prebuilt-"
 LOCAL_PREBUILT_RUBY_IMAGE_TAG="latest"
 RELEASED_PREBUILT_RUBY_VERSIONS=::File.readlines("ruby-pipeline/ruby-latest.yaml")
@@ -48,19 +49,25 @@ end
 ::ENV["PREBUILT_RUBY_IMAGE_TAG"] = PREBUILT_RUBY_IMAGE_TAG
 ::ENV["BUNDLER1_VERSION"] = BUNDLER1_VERSION
 ::ENV["BUNDLER2_VERSION"] = BUNDLER2_VERSION
+::ENV["TESTING_OS_NAME"] = OS_NAME
 
 PREBUILT_RUBY_IMAGES = PREBUILT_RUBY_VERSIONS.map do |v|
   "#{v}=#{PREBUILT_RUBY_IMAGE_BASE}#{v}:#{PREBUILT_RUBY_IMAGE_TAG}"
 end.join(",")
 
 require "rake/testtask"
 
-desc "Build local docker image for ubuntu16 image"
-task "build:ubuntu16" do |t, args|
-  sh "docker build --pull --no-cache -t ruby-ubuntu16" \
-    " --build-arg bundler_version=#{BUNDLER2_VERSION}" \
-    " --build-arg nodejs_version=#{NODEJS_VERSION}" \
-    " ruby-ubuntu16"
+["ubuntu16", "ubuntu20"].each do |os_name|
+  desc "Build local docker image for #{os_name} image"
+  task "build:#{os_name}" do |t, args|
+    sh "sed -e 's|@@IF_SSL10_DEV@@|#|g'" \
+      " ruby-#{os_name}/Dockerfile.in > ruby-#{os_name}/Dockerfile"
+    sh "docker build --pull --no-cache -t ruby-#{os_name}" \
+      " --build-arg bundler_version=#{BUNDLER2_VERSION}" \
+      " --build-arg nodejs_version=#{NODEJS_VERSION}" \
+      " --build-arg ssl10_version=#{SSL10_VERSION}" \
+      " ruby-#{os_name}"
+  end
 end
 
 desc "Build local docker image for current OS image"

build-ruby-binary-images.sh

@@ -19,7 +19,7 @@ set -e
 
 DIRNAME=$(dirname $0)
 
-OS_NAME=ubuntu16
+OS_NAME=ubuntu20
 RUNTIME_NAME=ruby
 PROJECT=
 IMAGE_TAG=
@@ -38,7 +38,7 @@ show_usage() {
   echo '  -a <tag>: use this base image tag (defaults to `staging`)' >&2
   echo '  -c <versions>: comma separated prebuilt ruby versions (defaults to prebuilt-versions.txt)' >&2
   echo '  -n <name>: set the runtime name (defaults to `ruby`)' >&2
-  echo '  -o <osname>: build against the given os base image (defaults to ubuntu16)' >&2
+  echo '  -o <osname>: build against the given os base image (defaults to ubuntu20)' >&2
   echo '  -p <project>: set the project (defaults to current gcloud config setting)' >&2
   echo '  -s: also tag new images as `staging`' >&2
   echo '  -t <tag>: set the new image tag (creates a new tag if not provided)' >&2
@@ -111,6 +111,7 @@ if [ -z "${IMAGE_TAG}" ]; then
 fi
 
 OS_BASE_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}
+OS_SSL10_BASE_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/ssl10
 PREBUILT_IMAGE_PREFIX=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/prebuilt/ruby-
 
 echo
@@ -137,9 +138,14 @@ echo
 sed -e "s|@@RUBY_OS_IMAGE@@|ruby-${OS_NAME}|g" \
   < ${DIRNAME}/ruby-prebuilt/Dockerfile.in > ${DIRNAME}/ruby-prebuilt/Dockerfile
 for version in "${PREBUILT_VERSIONS[@]}"; do
+  if [[ "${version}" < "2.4.0" ]]; then
+    chosen_os_base_image=${OS_SSL10_BASE_IMAGE}
+  else
+    chosen_os_base_image=${OS_BASE_IMAGE}
+  fi
   gcloud builds submit ${DIRNAME}/ruby-prebuilt \
     --config ${DIRNAME}/ruby-prebuilt/cloudbuild.yaml --project ${PROJECT} --timeout 20m \
-    --substitutions _OS_NAME=${OS_NAME},_OS_BASE_IMAGE=${OS_BASE_IMAGE},_IMAGE=${PREBUILT_IMAGE_PREFIX}${version},_TAG=${IMAGE_TAG},_BASE_TAG=${BASE_IMAGE_TAG},_RUBY_VERSION=${version}
+    --substitutions _OS_NAME=${OS_NAME},_OS_BASE_IMAGE=${chosen_os_base_image},_IMAGE=${PREBUILT_IMAGE_PREFIX}${version},_TAG=${IMAGE_TAG},_BASE_TAG=${BASE_IMAGE_TAG},_RUBY_VERSION=${version}
   echo "**** Built image: ${PREBUILT_IMAGE_PREFIX}${version}:${IMAGE_TAG}"
   if [ "${STAGING_FLAG}" = "true" ]; then
     gcloud container images add-tag --project ${PROJECT} \

build-ruby-runtime-images.sh

@@ -24,13 +24,14 @@ BUNDLER1_VERSION=1.17.3
 BUNDLER2_VERSION=2.1.4
 NODEJS_VERSION=16.15.0
 GCLOUD_VERSION=387.0.0
+SSL10_VERSION=1.0.2n-1ubuntu5.9
 
 
 set -e
 
 DIRNAME=$(dirname $0)
 
-OS_NAME=ubuntu16
+OS_NAME=ubuntu20
 RUNTIME_NAME=ruby
 BASE_IMAGE_DOCKERFILE=default
 PROJECT=
@@ -43,7 +44,7 @@ show_usage() {
   echo 'Flags:' >&2
   echo '  -i: use prebuilt ruby to build base image' >&2
   echo '  -n <name>: set the runtime name (defaults to `ruby`)' >&2
-  echo '  -o <osname>: build against the given os base image (defaults to `ubuntu16`)' >&2
+  echo '  -o <osname>: build against the given os base image (defaults to `ubuntu20`)' >&2
   echo '  -p <project>: set the project (defaults to current gcloud config setting)' >&2
   echo '  -s: also tag new images as `staging`' >&2
   echo '  -t <tag>: set the new image tag (creates a new tag if not provided)' >&2
@@ -107,6 +108,7 @@ if [ -z "${IMAGE_TAG}" ]; then
 fi
 
 OS_BASE_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}
+OS_SSL10_BASE_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/ssl10
 RUBY_BASIC_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/basic
 BUILD_TOOLS_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/build-tools
 GENERATE_DOCKERFILE_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/generate-dockerfile
@@ -115,6 +117,9 @@ PREBUILT_IMAGE_PREFIX=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/prebuilt/ruby
 echo
 echo "Building base, tools, and dockerfile generator images:"
 echo "  ${OS_BASE_IMAGE}:${IMAGE_TAG}"
+if [ "${OS_NAME}" != "ubuntu16" ]; then
+  echo "  ${OS_SSL10_BASE_IMAGE}:${IMAGE_TAG}"
+fi
 echo "  ${RUBY_BASIC_IMAGE}:${IMAGE_TAG}"
 echo "  ${BUILD_TOOLS_IMAGE}:${IMAGE_TAG}"
 echo "  ${GENERATE_DOCKERFILE_IMAGE}:${IMAGE_TAG}"
@@ -133,6 +138,22 @@ if [ -z "${AUTO_YES}" ]; then
 fi
 echo
 
+if [ "${OS_NAME}" != "ubuntu16" ]; then
+  sed -e "s|@@IF_SSL10_DEV@@||g" \
+    < ${DIRNAME}/ruby-${OS_NAME}/Dockerfile.in > ${DIRNAME}/ruby-${OS_NAME}/Dockerfile
+  gcloud builds submit ${DIRNAME}/ruby-${OS_NAME} \
+    --config ${DIRNAME}/ruby-${OS_NAME}/cloudbuild.yaml --project ${PROJECT} \
+    --substitutions _IMAGE=${OS_SSL10_BASE_IMAGE},_TAG=${IMAGE_TAG},_BUNDLER_VERSION=${BUNDLER2_VERSION},_NODEJS_VERSION=${NODEJS_VERSION},_SSL10_VERSION=${SSL10_VERSION}
+  echo "**** Built image: ${OS_SSL10_BASE_IMAGE}:${IMAGE_TAG}"
+  if [ "${STAGING_FLAG}" = "true" ]; then
+    gcloud container images add-tag --project ${PROJECT} \
+      ${OS_SSL10_BASE_IMAGE}:${IMAGE_TAG} ${OS_SSL10_BASE_IMAGE}:staging -q
+    echo "**** And tagged as ${OS_SSL10_BASE_IMAGE}:staging"
+  fi
+fi
+
+sed -e "s|@@IF_SSL10_DEV@@|#|g" \
+  < ${DIRNAME}/ruby-${OS_NAME}/Dockerfile.in > ${DIRNAME}/ruby-${OS_NAME}/Dockerfile
 gcloud builds submit ${DIRNAME}/ruby-${OS_NAME} \
   --config ${DIRNAME}/ruby-${OS_NAME}/cloudbuild.yaml --project ${PROJECT} \
   --substitutions _IMAGE=${OS_BASE_IMAGE},_TAG=${IMAGE_TAG},_BUNDLER_VERSION=${BUNDLER2_VERSION},_NODEJS_VERSION=${NODEJS_VERSION}

build-ruby-runtime-pipeline.sh

@@ -20,7 +20,7 @@ set -e
 DIRNAME=$(dirname $0)
 
 UPLOAD_BUCKET=
-OS_NAME=ubuntu16
+OS_NAME=ubuntu20
 RUNTIME_NAME=ruby
 PROJECT=
 RUNTIME_VERSION=
@@ -41,7 +41,7 @@ show_usage() {
   echo '  -b <bucket>: upload a new runtime definition to this gcs bucket (required)' >&2
   echo '  -c <versions>: comma separated prebuilt ruby versions (defaults to prebuilt-versions.txt)' >&2
   echo '  -n <name>: set the runtime name (defaults to `ruby`)' >&2
-  echo '  -o <osname>: use the given os base image (defaults to ubuntu16)' >&2
+  echo '  -o <osname>: use the given os base image (defaults to ubuntu20)' >&2
   echo '  -p <project>: set the builder images project (defaults to current gcloud config setting)' >&2
   echo '  -r <version>: set the runtime release (defaults to create a new version)' >&2
   echo '  -s: also upload a staging runtime pipeline (defaults to false)' >&2

integration_test/builder_app/test.yaml.in

@@ -1,9 +1,9 @@
 steps:
 - name: '${STAGING_BUILDER_IMAGE}'
-  args: ['--base-image', 'gcr.io/gcp-runtimes/ruby/ubuntu16:staging',
-         '--build-tools-image', 'gcr.io/gcp-runtimes/ruby/ubuntu16/build-tools:staging',
-         '--prebuilt-image', '2.6.6=gcr.io/gcp-runtimes/ruby/ubuntu16/prebuilt/ruby-2.6.6:latest',
-         '--default-ruby-version', '2.6.6']
+  args: ['--base-image', 'gcr.io/gcp-runtimes/ruby/ubuntu20:staging',
+         '--build-tools-image', 'gcr.io/gcp-runtimes/ruby/ubuntu20/build-tools:staging',
+         '--prebuilt-image', '3.1.2=gcr.io/gcp-runtimes/ruby/ubuntu20/prebuilt/ruby-3.1.2:latest',
+         '--default-ruby-version', '3.1.2']
 - name: 'gcr.io/cloud-builders/docker:latest'
   args: ['build', '--network=cloudbuild', '-t', '${_OUTPUT_IMAGE}', '.']
 images:

release-ruby-binary-images.sh

@@ -19,7 +19,7 @@ set -e
 
 DIRNAME=$(dirname $0)
 
-OS_NAME=ubuntu16
+OS_NAME=ubuntu20
 RUNTIME_NAME=ruby
 PROJECT=
 IMAGE_TAG=staging
@@ -35,7 +35,7 @@ show_usage() {
   echo 'Flags:' >&2
   echo '  -c <versions>: comma separated prebuilt ruby versions (defaults to prebuilt-versions.txt)' >&2
   echo '  -n <name>: set the runtime name (defaults to `ruby`)' >&2
-  echo '  -o <osname>: build against the given os base image (defaults to ubuntu16)' >&2
+  echo '  -o <osname>: build against the given os base image (defaults to ubuntu20)' >&2
   echo '  -p <project>: set the project (defaults to current gcloud config setting)' >&2
   echo '  -t <tag>: the image tag to release (defaults to `staging`)' >&2
   echo '  -y: automatically confirm' >&2

release-ruby-runtime-images.sh

@@ -19,7 +19,7 @@ set -e
 
 DIRNAME=$(dirname $0)
 
-OS_NAME=ubuntu16
+OS_NAME=ubuntu20
 RUNTIME_NAME=ruby
 PROJECT=
 IMAGE_TAG=staging
@@ -29,7 +29,7 @@ show_usage() {
   echo 'Usage: release-ruby-runtime-images.sh [flags...]' >&2
   echo 'Flags:' >&2
   echo '  -n <name>: set the runtime name (defaults to `ruby`)' >&2
-  echo '  -o <osname>: build against the given os base image (defaults to ubuntu16)' >&2
+  echo '  -o <osname>: build against the given os base image (defaults to ubuntu20)' >&2
   echo '  -p <project>: set the project (defaults to current gcloud config setting)' >&2
   echo '  -t <tag>: the image tag to release (defaults to `staging`)' >&2
   echo '  -y: automatically confirm' >&2
@@ -79,13 +79,17 @@ if [ -z "${PROJECT}" ]; then
 fi
 
 OS_BASE_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}
+OS_SSL10_BASE_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/ssl10
 RUBY_BASIC_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/basic
 BUILD_TOOLS_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/build-tools
 GENERATE_DOCKERFILE_IMAGE=gcr.io/${PROJECT}/${RUNTIME_NAME}/${OS_NAME}/generate-dockerfile
 
 echo
 echo "Releasing (i.e. tagging as latest) runtime images:"
 echo "  ${OS_BASE_IMAGE}:${IMAGE_TAG}"
+if [ "${OS_NAME}" != "ubuntu16" ]; then
+  echo "  ${OS_SSL10_BASE_IMAGE}:${IMAGE_TAG}"
+fi
 echo "  ${RUBY_BASIC_IMAGE}:${IMAGE_TAG}"
 echo "  ${BUILD_TOOLS_IMAGE}:${IMAGE_TAG}"
 echo "  ${GENERATE_DOCKERFILE_IMAGE}:${IMAGE_TAG}"
@@ -104,6 +108,13 @@ gcloud container images add-tag --project ${PROJECT} \
   ${OS_BASE_IMAGE}:latest -q
 echo "**** Tagged image ${OS_BASE_IMAGE}:${IMAGE_TAG} as latest"
 
+if [ "${OS_NAME}" != "ubuntu16" ]; then
+  gcloud container images add-tag --project ${PROJECT} \
+    ${OS_SSL10_BASE_IMAGE}:${IMAGE_TAG} \
+    ${OS_SSL10_BASE_IMAGE}:latest -q
+  echo "**** Tagged image ${OS_SSL10_BASE_IMAGE}:${IMAGE_TAG} as latest"
+fi
+
 gcloud container images add-tag --project ${PROJECT} \
   ${RUBY_BASIC_IMAGE}:${IMAGE_TAG} \
   ${RUBY_BASIC_IMAGE}:latest -q