diff --git a/bitnami/java/1.8/debian-10/Dockerfile b/bitnami/java/1.8/debian-10/Dockerfile index 594c6361b35e..2aadc8fc08c1 100644 --- a/bitnami/java/1.8/debian-10/Dockerfile +++ b/bitnami/java/1.8/debian-10/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer "Bitnami " COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl libc6 libgcc1 libsqlite3-dev libssl-dev locales procps sudo unzip wget +RUN install_packages ca-certificates curl gzip libc6 libgcc1 libsqlite3-dev libssl-dev locales procps tar wget RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/java-1.8.252-0-linux-amd64-debian-10.tar.gz && \ echo "d7271eff41b312b73aea7aea3b79a6b1a69cf6613804803daff952aff7d440b4 /tmp/bitnami/pkg/cache/java-1.8.252-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ tar -zxf /tmp/bitnami/pkg/cache/java-1.8.252-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ @@ -19,10 +19,13 @@ RUN sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS 90/' /etc/login.defs && \ sed -i 's/sha512/sha512 minlen=8/' /etc/pam.d/common-password ENV BITNAMI_APP_NAME="java" \ - BITNAMI_IMAGE_VERSION="1.8.252-debian-10-r33" \ + BITNAMI_IMAGE_VERSION="1.8.252-debian-10-r34" \ 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/debian-10/docker-compose.yml b/bitnami/java/1.8/debian-10/docker-compose.yml index fbe15292ec59..8945233a39ae 100644 --- a/bitnami/java/1.8/debian-10/docker-compose.yml +++ b/bitnami/java/1.8/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' + image: 'docker.io/bitnami/java:1.8-debian-10' command: ["tail", "-f", "/dev/null"] # To keep the container running ports: - 8080:8080 diff --git a/bitnami/java/1.8/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/java/1.8/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/java/1.8/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 e8008427802d..82758dce50b4 100644 --- a/bitnami/java/README.md +++ b/bitnami/java/README.md @@ -35,7 +35,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t - [`11-prod`, `11.0.7-prod-debian-10-r39` (11-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-prod-debian-10-r39/11-prod/debian-10/Dockerfile), [`11-prod-prod`, `11.0.7-prod-debian-10-r39-prod` (11-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-prod-debian-10-r39/11-prod/debian-10/prod/Dockerfile) - [`11`, `11.0.7-debian-10-r44` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-debian-10-r44/11/debian-10/Dockerfile), [`11-prod`, `11.0.7-debian-10-r44-prod` (11/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.7-debian-10-r44/11/debian-10/prod/Dockerfile) - [`1.8-prod`, `1.8.252-prod-debian-10-r36` (1.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-prod-debian-10-r36/1.8-prod/debian-10/Dockerfile), [`1.8-prod-prod`, `1.8.252-prod-debian-10-r36-prod` (1.8-prod/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-prod-debian-10-r36/1.8-prod/debian-10/prod/Dockerfile) -- [`1.8`, `1.8.252-debian-10-r33` (1.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-debian-10-r33/1.8/debian-10/Dockerfile), [`1.8-prod`, `1.8.252-debian-10-r33-prod` (1.8/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-debian-10-r33/1.8/debian-10/prod/Dockerfile) +- [`1.8`, `1.8.252-debian-10-r34` (1.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-debian-10-r34/1.8/debian-10/Dockerfile), [`1.8-prod`, `1.8.252-debian-10-r34-prod` (1.8/debian-10/prod/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.252-debian-10-r34/1.8/debian-10/prod/Dockerfile) Subscribe to project updates by watching the [bitnami/java GitHub repo](https://github.com/bitnami/bitnami-docker-java).