From f7afbb8e6fcb99b5c0adc38cf023ad839f05eefb Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 27 May 2020 21:52:56 +0000 Subject: [PATCH] 1.8.252-prod-debian-10-r38 release --- bitnami/java/1.8-prod/debian-10/Dockerfile | 19 ++++++++------- .../1.8-prod/debian-10/docker-compose.yml | 2 +- .../opt/bitnami/licenses/licenses.txt | 3 +++ .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/java/README.md | 2 +- 5 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 bitnami/java/1.8-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt create mode 100755 bitnami/java/1.8-prod/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/java/1.8-prod/debian-10/Dockerfile b/bitnami/java/1.8-prod/debian-10/Dockerfile index 92fd747410c5..55cbda8e753d 100644 --- a/bitnami/java/1.8-prod/debian-10/Dockerfile +++ b/bitnami/java/1.8-prod/debian-10/Dockerfile @@ -1,12 +1,13 @@ -FROM bitnami/java:1.8.252-debian-10-r34 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 libc6 libgcc1 locales procps sudo unzip +RUN install_packages ca-certificates curl gzip libc6 libgcc1 locales procps tar wget +RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/java-1.8.252-1-linux-amd64-debian-10.tar.gz && \ + echo "3544f73e9c57b186aca569baf5020a2fab480409445298f10b9054a379e15e1f /tmp/bitnami/pkg/cache/java-1.8.252-1-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ + tar -zxf /tmp/bitnami/pkg/cache/java-1.8.252-1-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ + rm -rf /tmp/bitnami/pkg/cache/java-1.8.252-1-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 @@ -17,14 +18,14 @@ 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="1.8.252-debian-10-r37-prod" \ + BITNAMI_IMAGE_VERSION="1.8.252-prod-debian-10-r38" \ JAVA_HOME="/opt/bitnami/java" \ LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ PATH="/opt/bitnami/java/bin:$PATH" CMD [ "bash" ] diff --git a/bitnami/java/1.8-prod/debian-10/docker-compose.yml b/bitnami/java/1.8-prod/debian-10/docker-compose.yml index 36a0a9db5417..0a52312ce640 100644 --- a/bitnami/java/1.8-prod/debian-10/docker-compose.yml +++ b/bitnami/java/1.8-prod/debian-10/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: java: tty: true # Enables debugging capabilities when attached to this container. - image: 'bitnami/java:1.8-prod' + image: 'docker.io/bitnami/java:1.8-prod-debian-10' command: ["tail", "-f", "/dev/null"] # To keep the container running ports: - 8080:8080 diff --git a/bitnami/java/1.8-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/java/1.8-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 000000000000..c76ba31f3b8a --- /dev/null +++ b/bitnami/java/1.8-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/java/1.8-prod/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/java/1.8-prod/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/java/1.8-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/java/README.md b/bitnami/java/README.md index c993656ece00..f5a1ca649b76 100644 --- a/bitnami/java/README.md +++ b/bitnami/java/README.md @@ -34,7 +34,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t - [`14`, `14.0.1-debian-10-r28` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/14.0.1-debian-10-r28/14/debian-10/Dockerfile), [`14-prod`, `14.0.1-debian-10-r28-prod` (14/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/14.0.1-debian-10-r28/14/debian-10/prod/Dockerfile) - [`11-prod`, `11.0.7-prod-debian-10-r41` (11-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-prod-debian-10-r41/11-prod/debian-10/Dockerfile), [`11-prod-prod`, `11.0.7-prod-debian-10-r41-prod` (11-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-prod-debian-10-r41/11-prod/debian-10/prod/Dockerfile) - [`11`, `11.0.7-debian-10-r46` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-debian-10-r46/11/debian-10/Dockerfile), [`11-prod`, `11.0.7-debian-10-r46-prod` (11/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-debian-10-r46/11/debian-10/prod/Dockerfile) -- [`1.8-prod`, `1.8.252-prod-debian-10-r37` (1.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-prod-debian-10-r37/1.8-prod/debian-10/Dockerfile), [`1.8-prod-prod`, `1.8.252-prod-debian-10-r37-prod` (1.8-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-prod-debian-10-r37/1.8-prod/debian-10/prod/Dockerfile) +- [`1.8-prod`, `1.8.252-prod-debian-10-r38` (1.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-prod-debian-10-r38/1.8-prod/debian-10/Dockerfile), [`1.8-prod-prod`, `1.8.252-prod-debian-10-r38-prod` (1.8-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-prod-debian-10-r38/1.8-prod/debian-10/prod/Dockerfile) - [`1.8`, `1.8.252-debian-10-r36` (1.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-debian-10-r36/1.8/debian-10/Dockerfile), [`1.8-prod`, `1.8.252-debian-10-r36-prod` (1.8/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-debian-10-r36/1.8/debian-10/prod/Dockerfile) Subscribe to project updates by watching the [bitnami/java GitHub repo](https://github.com/bitnami/bitnami-docker-java).