diff --git a/bitnami/ruby/2.6-prod/debian-10/Dockerfile b/bitnami/ruby/2.6-prod/debian-10/Dockerfile index e947cf390009..8bcd85b1a3df 100644 --- a/bitnami/ruby/2.6-prod/debian-10/Dockerfile +++ b/bitnami/ruby/2.6-prod/debian-10/Dockerfile @@ -1,23 +1,27 @@ -FROM bitnami/ruby:2.6.6-debian-10-r57 as development - -###### - FROM docker.io/bitnami/minideb:buster LABEL maintainer "Bitnami " +COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl ghostscript imagemagick libc6 libgmp-dev libncurses6 libreadline7 libssl1.1 libtinfo6 libxml2-dev libxslt1-dev procps sudo unzip zlib1g zlib1g-dev +RUN install_packages ca-certificates curl ghostscript gzip imagemagick libc6 libgmp-dev libncurses6 libreadline7 libssl1.1 libtinfo6 libxml2-dev libxslt1-dev procps tar wget zlib1g zlib1g-dev +RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/ruby-2.6.6-0-linux-amd64-debian-10.tar.gz && \ + echo "ecadce77e40822926c69f76cc11437954dd068793548c3f0a21007f9c4fafed3 /tmp/bitnami/pkg/cache/ruby-2.6.6-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ + tar -zxf /tmp/bitnami/pkg/cache/ruby-2.6.6-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ + rm -rf /tmp/bitnami/pkg/cache/ruby-2.6.6-0-linux-amd64-debian-10.tar.gz RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/^PASS_MIN_DAYS.*/PASS_MIN_DAYS 0/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password -COPY --from=development /opt/bitnami/licenses /opt/bitnami/licenses -COPY --from=development /opt/bitnami/ruby /opt/bitnami/ruby - ENV BITNAMI_APP_NAME="ruby" \ - BITNAMI_IMAGE_VERSION="2.6.6-debian-10-r62-prod" \ + BITNAMI_IMAGE_VERSION="2.6.6-prod-debian-10-r63" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ PATH="/opt/bitnami/ruby/bin:$PATH" +EXPOSE 3000 + +WORKDIR /app CMD [ "irb" ] diff --git a/bitnami/ruby/2.6-prod/debian-10/docker-compose.yml b/bitnami/ruby/2.6-prod/debian-10/docker-compose.yml index f8a224b53647..371d88c90365 100644 --- a/bitnami/ruby/2.6-prod/debian-10/docker-compose.yml +++ b/bitnami/ruby/2.6-prod/debian-10/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: ruby: tty: true # Enables debugging capabilities when attached to this container. - image: 'bitnami/ruby:2.6-prod' + image: 'docker.io/bitnami/ruby:2.6-prod-debian-10' # command: sh -c 'bundle install && bundle exec rails server -b 0.0.0.0 -p 3000' ports: - 3000:3000 diff --git a/bitnami/ruby/2.6-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/ruby/2.6-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 000000000000..c76ba31f3b8a --- /dev/null +++ b/bitnami/ruby/2.6-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt @@ -0,0 +1,3 @@ +Bitnami containers ship with software bundles. You can find the licenses under: +/opt/bitnami/nami/COPYING +/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/ruby/2.6-prod/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/ruby/2.6-prod/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/ruby/2.6-prod/debian-10/prebuildfs/usr/sbin/install_packages @@ -0,0 +1,24 @@ +#!/bin/sh +set -e +set -u +export DEBIAN_FRONTEND=noninteractive +n=0 +max=2 +until [ $n -gt $max ]; do + set +e + ( + apt-get update -qq && + apt-get install -y --no-install-recommends "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +rm -r /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/ruby/README.md b/bitnami/ruby/README.md index b3917f3d01e7..a7a94d2d4c6d 100644 --- a/bitnami/ruby/README.md +++ b/bitnami/ruby/README.md @@ -36,7 +36,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`2.7-prod-debian-10`, `2.7-debian-10-prod`, `2.7.1-prod-debian-10-r62`, `2.7.1-debian-10-r62-prod`, `2.7-prod`, `2.7.1-prod` (2.7-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ruby/blob/2.7.1-prod-debian-10-r62/2.7-prod/debian-10/Dockerfile) * [`2.7-debian-10`, `2.7.1-debian-10-r59`, `2.7`, `2.7.1` (2.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ruby/blob/2.7.1-debian-10-r59/2.7/debian-10/Dockerfile) -* [`2.6-prod-debian-10`, `2.6-debian-10-prod`, `2.6.6-prod-debian-10-r62`, `2.6.6-debian-10-r62-prod`, `2.6-prod`, `2.6.6-prod`, `latest-prod` (2.6-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ruby/blob/2.6.6-prod-debian-10-r62/2.6-prod/debian-10/Dockerfile) +* [`2.6-prod-debian-10`, `2.6-debian-10-prod`, `2.6.6-prod-debian-10-r63`, `2.6.6-debian-10-r63-prod`, `2.6-prod`, `2.6.6-prod`, `latest-prod` (2.6-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ruby/blob/2.6.6-prod-debian-10-r63/2.6-prod/debian-10/Dockerfile) * [`2.6-debian-10`, `2.6.6-debian-10-r58`, `2.6`, `2.6.6`, `latest` (2.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ruby/blob/2.6.6-debian-10-r58/2.6/debian-10/Dockerfile) * [`2.5-prod-debian-10`, `2.5-debian-10-prod`, `2.5.8-prod-debian-10-r62`, `2.5.8-debian-10-r62-prod`, `2.5-prod`, `2.5.8-prod` (2.5-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ruby/blob/2.5.8-prod-debian-10-r62/2.5-prod/debian-10/Dockerfile) * [`2.5-debian-10`, `2.5.8-debian-10-r60`, `2.5`, `2.5.8` (2.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ruby/blob/2.5.8-debian-10-r60/2.5/debian-10/Dockerfile)