From 0e9225c52da6957a5c0210dbb5e09d84aa156982 Mon Sep 17 00:00:00 2001 From: David Gomez Date: Tue, 16 Nov 2021 12:04:22 +0100 Subject: [PATCH] Deprecate branch 9.2 --- bitnami/jruby/9.2/debian-10/Dockerfile | 38 ------------------- .../jruby/9.2/debian-10/docker-compose.yml | 11 ------ .../opt/bitnami/.bitnami_components.json | 30 --------------- .../opt/bitnami/licenses/licenses.txt | 3 -- .../prebuildfs/usr/sbin/install_packages | 24 ------------ bitnami/jruby/README.md | 4 -- 6 files changed, 110 deletions(-) delete mode 100644 bitnami/jruby/9.2/debian-10/Dockerfile delete mode 100644 bitnami/jruby/9.2/debian-10/docker-compose.yml delete mode 100644 bitnami/jruby/9.2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/jruby/9.2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/jruby/9.2/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/jruby/9.2/debian-10/Dockerfile b/bitnami/jruby/9.2/debian-10/Dockerfile deleted file mode 100644 index 3da47312be8d..000000000000 --- a/bitnami/jruby/9.2/debian-10/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -FROM docker.io/bitnami/minideb:buster -LABEL maintainer "Bitnami " - -ENV OS_ARCH="amd64" \ - OS_FLAVOUR="debian-10" \ - OS_NAME="linux" - -COPY prebuildfs / -# Install required system packages and dependencies -RUN install_packages build-essential ca-certificates curl git gzip libbz2-1.0 libc6 libcom-err2 libcurl4 libexpat1 libffi6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncursesw6 libnettle6 libnghttp2-14 libp11-kit0 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libsqlite3-dev libssh2-1 libssl-dev libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 pkg-config procps sqlite3 tar unzip wget zlib1g -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/python-3.8.12-5-linux-amd64-debian-10.tar.gz && \ - echo "18aaf8247baa258f4e16de86673a3e799cd50bbef2824f0d2ae805c9c2068f11 /tmp/bitnami/pkg/cache/python-3.8.12-5-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/python-3.8.12-5-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/python-3.8.12-5-linux-amd64-debian-10.tar.gz -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/node-14.18.1-0-linux-amd64-debian-10.tar.gz && \ - echo "53575c1af09f423b9a2553b8b9880462f192961f4ada8fafa70a0238b106f26a /tmp/bitnami/pkg/cache/node-14.18.1-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/node-14.18.1-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/node-14.18.1-0-linux-amd64-debian-10.tar.gz -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/java-11.0.13-0-linux-amd64-debian-10.tar.gz && \ - echo "9552e53ccd3b0ec85a82c31c26a1462260e28b7c58770a5c53560afb02ec66d9 /tmp/bitnami/pkg/cache/java-11.0.13-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/java-11.0.13-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/java-11.0.13-0-linux-amd64-debian-10.tar.gz -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/jruby-9.2.20-0-1-linux-amd64-debian-10.tar.gz && \ - echo "fe452a1ba23ba7324d7c3453a338b643808ca4aeb17782f860024aa07ef012c7 /tmp/bitnami/pkg/cache/jruby-9.2.20-0-1-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/jruby-9.2.20-0-1-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/jruby-9.2.20-0-1-linux-amd64-debian-10.tar.gz -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 - -ENV BITNAMI_APP_NAME="jruby" \ - BITNAMI_IMAGE_VERSION="9.2.20-0-debian-10-r13" \ - PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/java/bin:/opt/bitnami/jruby/bin:$PATH" - -EXPOSE 3000 - -WORKDIR /app -CMD [ "irb" ] diff --git a/bitnami/jruby/9.2/debian-10/docker-compose.yml b/bitnami/jruby/9.2/debian-10/docker-compose.yml deleted file mode 100644 index 07ab33a4a238..000000000000 --- a/bitnami/jruby/9.2/debian-10/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: '2' - -services: - jruby: - tty: true # Enables debugging capabilities when attached to this container. - image: docker.io/bitnami/jruby:9.2 - # command: sh -c 'bundle install && bundle exec rails server -b 0.0.0.0 -p 3000' - ports: - - 3000:3000 - volumes: - - .:/app diff --git a/bitnami/jruby/9.2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/jruby/9.2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 3c71b46c9b89..000000000000 --- a/bitnami/jruby/9.2/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "java": { - "arch": "amd64", - "digest": "9552e53ccd3b0ec85a82c31c26a1462260e28b7c58770a5c53560afb02ec66d9", - "distro": "debian-10", - "type": "NAMI", - "version": "11.0.13-0" - }, - "jruby": { - "arch": "amd64", - "digest": "fe452a1ba23ba7324d7c3453a338b643808ca4aeb17782f860024aa07ef012c7", - "distro": "debian-10", - "type": "NAMI", - "version": "9.2.20-0-1" - }, - "node": { - "arch": "amd64", - "digest": "53575c1af09f423b9a2553b8b9880462f192961f4ada8fafa70a0238b106f26a", - "distro": "debian-10", - "type": "NAMI", - "version": "14.18.1-0" - }, - "python": { - "arch": "amd64", - "digest": "18aaf8247baa258f4e16de86673a3e799cd50bbef2824f0d2ae805c9c2068f11", - "distro": "debian-10", - "type": "NAMI", - "version": "3.8.12-5" - } -} \ No newline at end of file diff --git a/bitnami/jruby/9.2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/jruby/9.2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index c76ba31f3b8a..000000000000 --- a/bitnami/jruby/9.2/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt +++ /dev/null @@ -1,3 +0,0 @@ -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/jruby/9.2/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/jruby/9.2/debian-10/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index c9577647443b..000000000000 --- a/bitnami/jruby/9.2/debian-10/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,24 +0,0 @@ -#!/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/jruby/README.md b/bitnami/jruby/README.md index 534e408281c3..fee4487b514f 100644 --- a/bitnami/jruby/README.md +++ b/bitnami/jruby/README.md @@ -280,10 +280,6 @@ or using Docker Compose: $ docker-compose up ruby ``` -## Branch Deprecation Notice - -JRuby's branch 9.2 is no longer maintained by upstream and is now internally tagged as to be deprecated. This branch will no longer be released in our catalog a month after this notice is published, but already released container images will still persist in the registries. Valid to be removed starting on: 11-14-2021 - ## Contributing We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/bitnami-docker-jruby/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-jruby/pulls) with your contribution.