Set image tag as 20.04

Remove code specifig for Ubuntu 22.04

.github/workflows/main.yml

@@ -17,5 +17,5 @@ jobs:
     with:
       DOCKER_REPOSITORY_NAME: rubensa
       DOCKER_IMAGE_NAME: ubuntu-tini-dev
-      DOCKER_IMAGE_TAG: latest
+      DOCKER_IMAGE_TAG: 20.04
     secrets: inherit

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM rubensa/ubuntu-tini-user
+FROM rubensa/ubuntu-tini-user:20.04
 LABEL author="Ruben Suarez <[email protected]>"
 
 # Architecture component of TARGETPLATFORM (platform of the build result)
@@ -312,10 +312,10 @@ curl -o /usr/share/bash-completion/completions/ruby -sSL https://raw.githubuserc
 chmod 644 /usr/share/bash-completion/completions/ruby
 EOT
 
-# Ubuntu 22.04 comes with OpenSSL 3.0 and Ruby versions earlier than 2.4 used OpenSSL 1.0
+# Ubuntu 20.04 comes with OpenSSL 1.1 and Ruby versions earlier than 2.4 used OpenSSL 1.0
 # openssl installation directory
 ENV OPENSSL_ROOT_1_0=/opt/openssl-1.0
-COPY --from=rubensa/ubuntu-openssl-old ${OPENSSL_ROOT_1_0} ${OPENSSL_ROOT_1_0}
+COPY --from=rubensa/ubuntu-openssl-old:20.04 ${OPENSSL_ROOT_1_0} ${OPENSSL_ROOT_1_0}
 # Install OpenSSL 1.0
 RUN <<EOT
 echo "# Installing OpenSSL 1.0..."
@@ -328,21 +328,6 @@ ldconfig
 EOT
 # Use RUBY_CONFIGURE_OPTS=--with-openssl-dir=${OPENSSL_ROOT_1_0} before the command to install the ruby version < 2.4
 
-# Ubuntu 22.04 comes with OpenSSL 3.0 and Ruby versions earlier than 3.1 used OpenSSL 1.1
-# openssl installation directory
-ENV OPENSSL_ROOT_1_1=/opt/openssl-1.1
-COPY --from=rubensa/ubuntu-openssl-old ${OPENSSL_ROOT_1_1} ${OPENSSL_ROOT_1_1}
-# Install OpenSSL 1.1
-RUN <<EOT
-echo "# Installing OpenSSL 1.1..."
-# Link the system certs to OpenSSL directory
-rm -rf ${OPENSSL_ROOT_1_1}/certs
-ln -s /etc/ssl/certs ${OPENSSL_ROOT_1_1}
-echo "${OPENSSL_ROOT_1_1}/lib" > /etc/ld.so.conf.d/openssl-1.1.conf
-ldconfig
-EOT
-# Use RUBY_CONFIGURE_OPTS=--with-openssl-dir=${OPENSSL_ROOT_1_1} before the command to install the ruby version < 3.1
-
 # .Net installer version (https://docs.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install)
 ARG DOTNET_INSTALLER_VERSION=v1
 # Use this path for shared installation

README.md

@@ -1,6 +1,6 @@
 # Docker image with development tools
 
-This is a Docker image based on [rubensa/ubuntu-tini-user](https://github.com/rubensa/docker-ubuntu-tini-user) and includes various development tools.  This image includes [old openssl](https://www.openssl.org/source/old/) version builds from [rubensa/ubuntu-openssl-old](https://github.com/rubensa/docker-ubuntu-openssl-old) to allow old Ruby versions to be installed.
+This is a Docker image based on [rubensa/ubuntu-tini-user](https://github.com/rubensa/docker-ubuntu-tini-user) 20.04 and includes various development tools.  This image includes [old openssl](https://www.openssl.org/source/old/) version builds from [rubensa/ubuntu-openssl-old](https://github.com/rubensa/docker-ubuntu-openssl-old) 20.04 to allow old Ruby versions to be installed.
 
 ## Building
 
@@ -11,7 +11,7 @@ You can build the image like this:
 
 DOCKER_REPOSITORY_NAME="rubensa"
 DOCKER_IMAGE_NAME="ubuntu-tini-dev"
-DOCKER_IMAGE_TAG="latest"
+DOCKER_IMAGE_TAG="20.04"
 
 docker buildx build --platform=linux/amd64,linux/arm64 --no-cache \
   -t "${DOCKER_REPOSITORY_NAME}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" \
@@ -32,7 +32,7 @@ You can run the container like this (change --rm with -d if you don't want the c
 
 DOCKER_REPOSITORY_NAME="rubensa"
 DOCKER_IMAGE_NAME="ubuntu-tini-dev"
-DOCKER_IMAGE_TAG="latest"
+DOCKER_IMAGE_TAG="20.04"
 
 # Get current user UID
 USER_ID=$(id -u)

build.sh

@@ -2,7 +2,7 @@
 
 DOCKER_REPOSITORY_NAME="rubensa"
 DOCKER_IMAGE_NAME="ubuntu-tini-dev"
-DOCKER_IMAGE_TAG="latest"
+DOCKER_IMAGE_TAG="20.04"
 
 # see: https://github.com/docker/buildx/issues/495#issuecomment-761562905
 #docker buildx build --platform=linux/amd64,linux/arm64 --no-cache --progress=plain --pull \

run.sh

@@ -2,7 +2,7 @@
 
 DOCKER_REPOSITORY_NAME="rubensa"
 DOCKER_IMAGE_NAME="ubuntu-tini-dev"
-DOCKER_IMAGE_TAG="latest"
+DOCKER_IMAGE_TAG="20.04"
 
 # Get current user UID
 USER_ID=$(id -u)