diff --git a/bitnami/node/10-prod/debian-10/Dockerfile b/bitnami/node/10-prod/debian-10/Dockerfile index 6e2dfaeb528f..e9a7d75bd246 100644 --- a/bitnami/node/10-prod/debian-10/Dockerfile +++ b/bitnami/node/10-prod/debian-10/Dockerfile @@ -1,23 +1,27 @@ -FROM bitnami/node:10.20.1-debian-10-r44 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 ghostscript imagemagick libbz2-1.0 libc6 libffi6 libgcc1 liblzma5 libncursesw6 libreadline7 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 procps sudo unzip zlib1g +RUN install_packages ca-certificates curl ghostscript gzip imagemagick libbz2-1.0 libc6 libffi6 libgcc1 liblzma5 libncursesw6 libreadline7 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 procps tar wget zlib1g +RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/node-10.20.1-5-linux-amd64-debian-10.tar.gz && \ + echo "0729ab9dcf6c86f78b18c5e562e3e504fda5dc25e9fdcd8d192106e805142f7a /tmp/bitnami/pkg/cache/node-10.20.1-5-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \ + tar -zxf /tmp/bitnami/pkg/cache/node-10.20.1-5-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ + rm -rf /tmp/bitnami/pkg/cache/node-10.20.1-5-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 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/licenses /opt/bitnami/licenses -COPY --from=development /opt/bitnami/node /opt/bitnami/node - ENV BITNAMI_APP_NAME="node" \ - BITNAMI_IMAGE_VERSION="10.20.1-debian-10-r45-prod" \ - PATH="/opt/bitnami/node/bin:$PATH" + BITNAMI_IMAGE_VERSION="10.20.1-prod-debian-10-r46" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" \ + PATH="/opt/bitnami/node/bin:/opt/bitnami/python/bin:$PATH" +EXPOSE 3000 + +WORKDIR /app CMD [ "node" ] diff --git a/bitnami/node/10-prod/debian-10/docker-compose.yml b/bitnami/node/10-prod/debian-10/docker-compose.yml index 910353d0f661..db8a01f11a16 100644 --- a/bitnami/node/10-prod/debian-10/docker-compose.yml +++ b/bitnami/node/10-prod/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:10-prod' + image: 'docker.io/bitnami/node:10-prod-debian-10' # command: sh -c 'npm install && npm start' ports: - 3000:3000 diff --git a/bitnami/node/10-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/node/10-prod/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt new file mode 100644 index 000000000000..c76ba31f3b8a --- /dev/null +++ b/bitnami/node/10-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/node/10-prod/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/node/10-prod/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/node/10-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/node/README.md b/bitnami/node/README.md index 81407615e6b1..1d72d2b44889 100644 --- a/bitnami/node/README.md +++ b/bitnami/node/README.md @@ -46,7 +46,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`13-debian-10`, `13.14.0-debian-10-r29`, `13`, `13.14.0` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/13.14.0-debian-10-r29/13/debian-10/Dockerfile) * [`12-prod-debian-10`, `12-debian-10-prod`, `12.17.0-prod-debian-10-r0`, `12.17.0-debian-10-r0-prod`, `12-prod`, `12.17.0-prod`, `latest-prod` (12-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/12.17.0-prod-debian-10-r0/12-prod/debian-10/Dockerfile) * [`12-debian-10`, `12.17.0-debian-10-r0`, `12`, `12.17.0`, `latest` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/12.17.0-debian-10-r0/12/debian-10/Dockerfile) -* [`10-prod-debian-10`, `10-debian-10-prod`, `10.20.1-prod-debian-10-r45`, `10.20.1-debian-10-r45-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-r45/10-prod/debian-10/Dockerfile) +* [`10-prod-debian-10`, `10-debian-10-prod`, `10.20.1-prod-debian-10-r46`, `10.20.1-debian-10-r46-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-r46/10-prod/debian-10/Dockerfile) * [`10-debian-10`, `10.20.1-debian-10-r45`, `10`, `10.20.1` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-node/blob/10.20.1-debian-10-r45/10/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/node GitHub repo](https://github.com/bitnami/bitnami-docker-node).