From 7dd96d2639038b321dbc876181ada5954892a064 Mon Sep 17 00:00:00 2001 From: Ruben Suarez Date: Thu, 25 Nov 2021 17:23:20 +0100 Subject: [PATCH] Set image tag as 18.04 Remove code specifig for Ubuntu 22.04 For Ubuntu libgdbm version available is 5 (not 6) --- .github/workflows/main.yml | 2 +- Dockerfile | 27 ++++++--------------------- README.md | 6 +++--- build.sh | 2 +- run.sh | 2 +- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9af00ae..72c28d1 100644 --- a/.github/workflows/main.yml +++ b/.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: 18.04 secrets: inherit diff --git a/Dockerfile b/Dockerfile index 292c042..3e47b65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.4 -FROM rubensa/ubuntu-tini-user +FROM rubensa/ubuntu-tini-user:18.04 LABEL author="Ruben Suarez " # Architecture component of TARGETPLATFORM (platform of the build result) @@ -19,8 +19,8 @@ ENV DEBIAN_FRONTEND=noninteractive # Install dependencies and other usefull software and libraries RUN <&1 +echo "# Installing curl, netcat-openbsd, unzip, zip, build-essential, git, bison, libssl-dev, libyaml-dev, libreadline6-dev, zlib1g-dev, libncurses5-dev, libffi-dev, libgdbm5, libgdbm-dev, libdb-dev, libmysqlclient-dev, unixodbc-dev, libpq-dev, freetds-dev, libicu-dev, libxtst6, procps, lsb-release, openssh-client, p7zip-full, p7zip-rar, unrar, jq and bsdmainutils..." +apt-get -y install --no-install-recommends curl netcat-openbsd unzip zip build-essential git bison libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm5 libgdbm-dev libdb-dev libmysqlclient-dev unixodbc-dev libpq-dev freetds-dev libicu-dev libxtst6 procps lsb-release openssh-client p7zip-full p7zip-rar unrar jq bsdmainutils 2>&1 if [ "$TARGETARCH" = "amd64" ]; then echo "# Installing rar..." apt-get -y install --no-install-recommends rar 2>&1 @@ -273,7 +273,7 @@ ARG RBENV_VERSION=1.3.0 ARG RUBY_BUILD_VERSION=20240917 # rbenv installation directory ENV RBENV_ROOT=/opt/rbenv -# Install Ruby Environment Manager (requires curl, autoconf, bison, build-essential, libssl-dev, libyaml-dev, libreadline6-dev, zlib1g-dev, libncurses5-dev, libffi-dev, libgdbm6, libgdbm-dev, libdb-dev) +# Install Ruby Environment Manager (requires curl, autoconf, bison, build-essential, libssl-dev, libyaml-dev, libreadline6-dev, zlib1g-dev, libncurses5-dev, libffi-dev, libgdbm5, libgdbm-dev, libdb-dev) RUN < /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 diff --git a/README.md b/README.md index 73507e3..a4fe7ef 100644 --- a/README.md +++ b/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) 18.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) 18.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="18.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="18.04" # Get current user UID USER_ID=$(id -u) diff --git a/build.sh b/build.sh index 4726979..f69c102 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ DOCKER_REPOSITORY_NAME="rubensa" DOCKER_IMAGE_NAME="ubuntu-tini-dev" -DOCKER_IMAGE_TAG="latest" +DOCKER_IMAGE_TAG="18.04" # see: https://github.com/docker/buildx/issues/495#issuecomment-761562905 #docker buildx build --platform=linux/amd64,linux/arm64 --no-cache --progress=plain --pull \ diff --git a/run.sh b/run.sh index f856f94..d5c90d6 100755 --- a/run.sh +++ b/run.sh @@ -2,7 +2,7 @@ DOCKER_REPOSITORY_NAME="rubensa" DOCKER_IMAGE_NAME="ubuntu-tini-dev" -DOCKER_IMAGE_TAG="latest" +DOCKER_IMAGE_TAG="18.04" # Get current user UID USER_ID=$(id -u)