From fd9bbd67777422debcffdb57b14b736db80dc637 Mon Sep 17 00:00:00 2001 From: David Gomez Date: Wed, 29 Apr 2020 14:24:50 +0200 Subject: [PATCH] Deprecate java 13 (#7) --- bitnami/java/13-prod/debian-10/Dockerfile | 30 ------------------- .../java/13-prod/debian-10/docker-compose.yml | 11 ------- bitnami/java/13/debian-10/Dockerfile | 28 ----------------- bitnami/java/13/debian-10/docker-compose.yml | 11 ------- .../opt/bitnami/licenses/licenses.txt | 3 -- bitnami/java/README.md | 4 --- 6 files changed, 87 deletions(-) delete mode 100644 bitnami/java/13-prod/debian-10/Dockerfile delete mode 100644 bitnami/java/13-prod/debian-10/docker-compose.yml delete mode 100644 bitnami/java/13/debian-10/Dockerfile delete mode 100644 bitnami/java/13/debian-10/docker-compose.yml delete mode 100644 bitnami/java/13/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt diff --git a/bitnami/java/13-prod/debian-10/Dockerfile b/bitnami/java/13-prod/debian-10/Dockerfile deleted file mode 100644 index 058a2dfde512..000000000000 --- a/bitnami/java/13-prod/debian-10/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM bitnami/java:13.0.2-debian-10-r89 as development - -###### - -FROM docker.io/bitnami/minideb:buster -LABEL maintainer "Bitnami " - -# Install required system packages and dependencies -RUN install_packages ca-certificates curl libc6 locales procps sudo unzip zlib1g -RUN apt-get update && apt-get upgrade -y && \ - rm -r /var/lib/apt/lists /var/cache/apt/archives -RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 -RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \ - DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales -RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen -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/java /opt/bitnami/java -COPY --from=development /opt/bitnami/licenses /opt/bitnami/licenses - -ENV BITNAMI_APP_NAME="java" \ - BITNAMI_IMAGE_VERSION="13.0.2-debian-10-r90-prod" \ - JAVA_HOME="/opt/bitnami/java" \ - LANG="en_US.UTF-8" \ - LANGUAGE="en_US:en" \ - PATH="/opt/bitnami/java/bin:$PATH" - -CMD [ "bash" ] diff --git a/bitnami/java/13-prod/debian-10/docker-compose.yml b/bitnami/java/13-prod/debian-10/docker-compose.yml deleted file mode 100644 index fa1947bde683..000000000000 --- a/bitnami/java/13-prod/debian-10/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: '2' - -services: - java: - tty: true # Enables debugging capabilities when attached to this container. - image: 'bitnami/java:13-prod' - command: ["tail", "-f", "/dev/null"] # To keep the container running - ports: - - 8080:8080 - volumes: - - .:/app diff --git a/bitnami/java/13/debian-10/Dockerfile b/bitnami/java/13/debian-10/Dockerfile deleted file mode 100644 index 29d1aad60f3e..000000000000 --- a/bitnami/java/13/debian-10/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM docker.io/bitnami/minideb:buster -LABEL maintainer "Bitnami " - -COPY prebuildfs / -# Install required system packages and dependencies -RUN install_packages ca-certificates curl libc6 libsqlite3-dev libssl-dev locales procps sudo unzip wget zlib1g -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/java-13.0.2-0-linux-amd64-debian-10.tar.gz && \ - echo "b36f6436b05acf551be972c573d87437fa2260a7987c8579201787fdd7fb6b5a /tmp/bitnami/pkg/cache/java-13.0.2-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/java-13.0.2-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/java-13.0.2-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 localedef -c -f UTF-8 -i en_US en_US.UTF-8 -RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \ - DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales -RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen -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="java" \ - BITNAMI_IMAGE_VERSION="13.0.2-debian-10-r90" \ - JAVA_HOME="/opt/bitnami/java" \ - LANG="en_US.UTF-8" \ - LANGUAGE="en_US:en" \ - PATH="/opt/bitnami/java/bin:$PATH" - -CMD [ "bash" ] diff --git a/bitnami/java/13/debian-10/docker-compose.yml b/bitnami/java/13/debian-10/docker-compose.yml deleted file mode 100644 index d83c84bdabdb..000000000000 --- a/bitnami/java/13/debian-10/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: '2' - -services: - java: - tty: true # Enables debugging capabilities when attached to this container. - image: 'bitnami/java:13' - command: ["tail", "-f", "/dev/null"] # To keep the container running - ports: - - 8080:8080 - volumes: - - .:/app diff --git a/bitnami/java/13/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/java/13/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index c76ba31f3b8a..000000000000 --- a/bitnami/java/13/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/java/README.md b/bitnami/java/README.md index c46dbd951dd9..04fe5a5516e2 100644 --- a/bitnami/java/README.md +++ b/bitnami/java/README.md @@ -31,12 +31,8 @@ Learn more about the Bitnami tagging policy and the difference between rolling t - [`14`, `14.0.1-debian-10-r0` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/14.0.1-debian-10-r0/14/debian-10/Dockerfile), [`14-prod`, `14.0.1-debian-10-r0-prod` (14/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/14.0.1-debian-10-r0/14/debian-10/prod/Dockerfile) -- [`13`, `13.0.2-debian-10-r95` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.2-debian-10-r95/13/debian-10/Dockerfile), [`13-prod`, `13.0.2-debian-10-r95-prod` (13/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.2-debian-10-r95/13/debian-10/prod/Dockerfile) -- [`13-prod`, `13.0.2-debian-10-r91-prod` (13-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.2-debian-10-r91-prod/13-prod/debian-10/Dockerfile), [`13-prod-prod`, `13.0.2-debian-10-r91-prod-prod` (13-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/13.0.2-debian-10-r91-prod/13-prod/debian-10/prod/Dockerfile) - [`11`, `11.0.7-debian-10-r18` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-debian-10-r18/11/debian-10/Dockerfile), [`11-prod`, `11.0.7-debian-10-r18-prod` (11/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-debian-10-r18/11/debian-10/prod/Dockerfile) - [`11-prod`, `11.0.7-debian-10-r13-prod` (11-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-debian-10-r13-prod/11-prod/debian-10/Dockerfile), [`11-prod-prod`, `11.0.7-debian-10-r13-prod-prod` (11-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-debian-10-r13-prod/11-prod/debian-10/prod/Dockerfile) -- [`10`, `10.0.2-debian-10-r0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/10.0.2-debian-10-r0/10/debian-10/Dockerfile), [`10-prod`, `10.0.2-debian-10-r0-prod` (10/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/10.0.2-debian-10-r0/10/debian-10/prod/Dockerfile) -- [`1.9`, `1.9.181-debian-10-r0` (1.9/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.9.181-debian-10-r0/1.9/debian-10/Dockerfile), [`1.9-prod`, `1.9.181-debian-10-r0-prod` (1.9/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.9.181-debian-10-r0/1.9/debian-10/prod/Dockerfile) - [`1.8`, `1.8.252-debian-10-r7` (1.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-debian-10-r7/1.8/debian-10/Dockerfile), [`1.8-prod`, `1.8.252-debian-10-r7-prod` (1.8/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-debian-10-r7/1.8/debian-10/prod/Dockerfile) - [`1.8-prod`, `1.8.252-debian-10-r10-prod` (1.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-debian-10-r10-prod/1.8-prod/debian-10/Dockerfile), [`1.8-prod-prod`, `1.8.252-debian-10-r10-prod-prod` (1.8-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-debian-10-r10-prod/1.8-prod/debian-10/prod/Dockerfile)