diff --git a/bitnami/node/12/debian-10/Dockerfile b/bitnami/node/12/debian-10/Dockerfile index 290a66cce149..419f0b39b421 100644 --- a/bitnami/node/12/debian-10/Dockerfile +++ b/bitnami/node/12/debian-10/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer "Bitnami " COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages build-essential ca-certificates curl ghostscript git imagemagick libbz2-1.0 libc6 libffi6 libgcc1 liblzma5 libncursesw6 libreadline7 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libstdc++6 libtinfo6 pkg-config procps sudo unzip wget zlib1g +RUN install_packages build-essential ca-certificates curl ghostscript git gzip imagemagick libbz2-1.0 libc6 libffi6 libgcc1 liblzma5 libncursesw6 libreadline7 libsqlite3-0 libsqlite3-dev libssl-dev libssl1.1 libstdc++6 libtinfo6 pkg-config procps tar unzip wget zlib1g RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/node-12.16.3-3-linux-amd64-debian-10.tar.gz && \ echo "5e0ba24a98ca8b75c9a5400d0d03b48862a30511b6c54e71ec92eee32fb33f29 /tmp/bitnami/pkg/cache/node-12.16.3-3-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ tar -zxf /tmp/bitnami/pkg/cache/node-12.16.3-3-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ @@ -15,7 +15,10 @@ 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="node" \ - BITNAMI_IMAGE_VERSION="12.16.3-debian-10-r27" \ + BITNAMI_IMAGE_VERSION="12.16.3-debian-10-r28" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ PATH="/opt/bitnami/node/bin:/opt/bitnami/python/bin:$PATH" EXPOSE 3000 diff --git a/bitnami/node/12/debian-10/docker-compose.yml b/bitnami/node/12/debian-10/docker-compose.yml index 46ebe8ba372d..5808d23b1186 100644 --- a/bitnami/node/12/debian-10/docker-compose.yml +++ b/bitnami/node/12/debian-10/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: node: tty: true # Enables debugging capabilities when attached to this container. - image: 'bitnami/node:12' + image: 'docker.io/bitnami/node:12-debian-10' # command: sh -c 'npm install && npm start' ports: - 3000:3000 diff --git a/bitnami/node/12/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/node/12/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/node/12/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/node/README.md b/bitnami/node/README.md index 82d3c16ffa65..cdb4cb23d40e 100644 --- a/bitnami/node/README.md +++ b/bitnami/node/README.md @@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`13-prod-debian-10`, `13-debian-10-prod`, `13.14.0-prod-debian-10-r22`, `13.14.0-debian-10-r22-prod`, `13-prod`, `13.14.0-prod` (13-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/13.14.0-prod-debian-10-r22/13-prod/debian-10/Dockerfile) * [`13-debian-10`, `13.14.0-debian-10-r24`, `13`, `13.14.0` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/13.14.0-debian-10-r24/13/debian-10/Dockerfile) * [`12-prod-debian-10`, `12-debian-10-prod`, `12.16.3-prod-debian-10-r22`, `12.16.3-debian-10-r22-prod`, `12-prod`, `12.16.3-prod`, `latest-prod` (12-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/12.16.3-prod-debian-10-r22/12-prod/debian-10/Dockerfile) -* [`12-debian-10`, `12.16.3-debian-10-r27`, `12`, `12.16.3`, `latest` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/12.16.3-debian-10-r27/12/debian-10/Dockerfile) +* [`12-debian-10`, `12.16.3-debian-10-r28`, `12`, `12.16.3`, `latest` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/12.16.3-debian-10-r28/12/debian-10/Dockerfile) * [`10-prod-debian-10`, `10-debian-10-prod`, `10.20.1-prod-debian-10-r40`, `10.20.1-debian-10-r40-prod`, `10-prod`, `10.20.1-prod` (10-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/10.20.1-prod-debian-10-r40/10-prod/debian-10/Dockerfile) * [`10-debian-10`, `10.20.1-debian-10-r41`, `10`, `10.20.1` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/10.20.1-debian-10-r41/10/debian-10/Dockerfile) diff --git a/bitnami/node/docker-compose.yml b/bitnami/node/docker-compose.yml index 46ebe8ba372d..5808d23b1186 100644 --- a/bitnami/node/docker-compose.yml +++ b/bitnami/node/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: node: tty: true # Enables debugging capabilities when attached to this container. - image: 'bitnami/node:12' + image: 'docker.io/bitnami/node:12-debian-10' # command: sh -c 'npm install && npm start' ports: - 3000:3000