From c2dc237925c1f5603e841ac59419b76a93291897 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 7 Apr 2021 19:19:54 +0000 Subject: [PATCH] 4.17.1-debian-10-r390 release --- bitnami/express/4/debian-10/Dockerfile | 4 ++-- bitnami/express/4/debian-10/docker-compose.yml | 4 ++-- .../debian-10/prebuildfs/opt/bitnami/.bitnami_components.json | 4 ++-- bitnami/express/4/debian-10/rootfs/app-entrypoint.sh | 4 +++- .../express/4/debian-10/rootfs/opt/bitnami/express/functions | 3 +++ bitnami/express/README.md | 2 +- bitnami/express/docker-compose-mariadb.yml | 4 ++-- bitnami/express/docker-compose-postgresql.yml | 4 ++-- bitnami/express/docker-compose.yml | 4 ++-- 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/bitnami/express/4/debian-10/Dockerfile b/bitnami/express/4/debian-10/Dockerfile index 155004bbad6b..59e60a49bff9 100644 --- a/bitnami/express/4/debian-10/Dockerfile +++ b/bitnami/express/4/debian-10/Dockerfile @@ -10,7 +10,7 @@ COPY prebuildfs / RUN install_packages ca-certificates curl ghostscript gzip imagemagick libbz2-1.0 libc6 libcom-err2 libcurl4 libffi6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libncursesw6 libnettle6 libnghttp2-14 libp11-kit0 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 netcat procps sudo tar zlib1g RUN /build/bitnami-user.sh RUN /build/install-nami.sh -RUN bitnami-pkg install node-14.16.0-2 --checksum 3a97194c5f633d2d507e01bec5dd6ff315950a8ddbbd769f9a96e9c8f395533b +RUN bitnami-pkg install node-14.16.1-0 --checksum 115acb61c7b819f4733d937e81099c259e46c82f693ee32cc880db70356db285 RUN bitnami-pkg install sequelize-cli-5.5.1-0 --checksum 7e572fea880336f69bf7b0b34cd718ee81e7114fe61313acaba12b7a5564cddc RUN bitnami-pkg install git-2.31.1-0 --checksum 08cc25cd961bf4ea1695b9d11cd4dc0ebb2f4a00afd6cacbc18c81d6cd104aa2 RUN bitnami-pkg install express-generator-4.16.1-0 --checksum 09dc5947a709a9bbeb257b17cd13bdb2ca87b08fa17baab4583bdc026badef35 @@ -22,7 +22,7 @@ RUN bitnami-pkg install express-4.17.1-0 --checksum e90ac676893a1c1edaf31f5bac8b COPY rootfs / RUN mkdir -p /dist /app /.npm /.config /.cache /.local && chmod g+rwx /dist /app /.npm /.config /.cache /.local ENV BITNAMI_APP_NAME="express" \ - BITNAMI_IMAGE_VERSION="4.17.1-debian-10-r389" \ + BITNAMI_IMAGE_VERSION="4.17.1-debian-10-r390" \ NAMI_PREFIX="/.nami" \ OS_ARCH="amd64" \ OS_FLAVOUR="debian-10" \ diff --git a/bitnami/express/4/debian-10/docker-compose.yml b/bitnami/express/4/debian-10/docker-compose.yml index 6919f876d93a..09793b284d8f 100644 --- a/bitnami/express/4/debian-10/docker-compose.yml +++ b/bitnami/express/4/debian-10/docker-compose.yml @@ -2,11 +2,11 @@ version: '2' services: mongodb: - image: 'docker.io/bitnami/mongodb:4.2-debian-10' + image: docker.io/bitnami/mongodb:4.2 express: tty: true # Enables debugging capabilities when attached to this container. - image: 'docker.io/bitnami/express:4-debian-10' + image: docker.io/bitnami/express:4 command: npm start environment: - PORT=3000 diff --git a/bitnami/express/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/express/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index a281d4de0460..0c0a18b01759 100644 --- a/bitnami/express/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/express/4/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -36,10 +36,10 @@ }, "node": { "arch": "amd64", - "digest": "3a97194c5f633d2d507e01bec5dd6ff315950a8ddbbd769f9a96e9c8f395533b", + "digest": "115acb61c7b819f4733d937e81099c259e46c82f693ee32cc880db70356db285", "distro": "debian-10", "type": "NAMI", - "version": "14.16.0-2" + "version": "14.16.1-0" }, "sequelize-cli": { "arch": "amd64", diff --git a/bitnami/express/4/debian-10/rootfs/app-entrypoint.sh b/bitnami/express/4/debian-10/rootfs/app-entrypoint.sh index 929fa1e1dd68..5293ffd202d6 100755 --- a/bitnami/express/4/debian-10/rootfs/app-entrypoint.sh +++ b/bitnami/express/4/debian-10/rootfs/app-entrypoint.sh @@ -1,12 +1,14 @@ #!/bin/bash -e +# shellcheck disable=SC1091 + . /opt/bitnami/base/functions . /opt/bitnami/base/helpers . /opt/bitnami/express/functions print_welcome_page -if [ "$1" = npm ] && [ "$2" = "start" -o "$2" = "run" ]; then +if [ "$1" = npm ] && { [ "$2" = "start" ] || [ "$2" = "run" ]; }; then bootstrap_express_app add_dockerfile diff --git a/bitnami/express/4/debian-10/rootfs/opt/bitnami/express/functions b/bitnami/express/4/debian-10/rootfs/opt/bitnami/express/functions index 2ba2748aabde..21f1b9658799 100644 --- a/bitnami/express/4/debian-10/rootfs/opt/bitnami/express/functions +++ b/bitnami/express/4/debian-10/rootfs/opt/bitnami/express/functions @@ -1,4 +1,7 @@ #!/bin/bash + +# shellcheck disable=SC1091 + . /opt/bitnami/base/functions INIT_SEM=/tmp/initialized.sem diff --git a/bitnami/express/README.md b/bitnami/express/README.md index fb4488ae8de9..aeeab871691e 100644 --- a/bitnami/express/README.md +++ b/bitnami/express/README.md @@ -28,7 +28,7 @@ $ docker-compose up Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`4`, `4-debian-10`, `4.17.1`, `4.17.1-debian-10-r389`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-express/blob/4.17.1-debian-10-r389/4/debian-10/Dockerfile) +* [`4`, `4-debian-10`, `4.17.1`, `4.17.1-debian-10-r390`, `latest` (4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-express/blob/4.17.1-debian-10-r390/4/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/codiad GitHub repo](https://github.com/bitnami/bitnami-docker-codiad). diff --git a/bitnami/express/docker-compose-mariadb.yml b/bitnami/express/docker-compose-mariadb.yml index 98554dd22b69..9fb82d2d6f9d 100644 --- a/bitnami/express/docker-compose-mariadb.yml +++ b/bitnami/express/docker-compose-mariadb.yml @@ -2,14 +2,14 @@ version: '2' services: mariadb: - image: 'docker.io/bitnami/mariadb:10.3-debian-10' + image: docker.io/bitnami/mariadb:10.3 environment: - ALLOW_EMPTY_PASSWORD=yes - MARIADB_DATABASE=myapp express: tty: true # Enables debugging capabilities when attached to this container. - image: docker.io/bitnami/express:4-debian-10 + image: docker.io/bitnami/express:4 command: npm run development environment: - PORT=3000 diff --git a/bitnami/express/docker-compose-postgresql.yml b/bitnami/express/docker-compose-postgresql.yml index d13eb8ed68ac..737c52155e2b 100644 --- a/bitnami/express/docker-compose-postgresql.yml +++ b/bitnami/express/docker-compose-postgresql.yml @@ -2,13 +2,13 @@ version: '2' services: postgresql: - image: docker.io/bitnami/postgresql:11-debian-10 + image: docker.io/bitnami/postgresql:11 environment: - POSTGRESQL_DATABASE=myapp - ALLOW_EMPTY_PASSWORD=yes express: tty: true # Enables debugging capabilities when attached to this container. - image: docker.io/bitnami/express:4-debian-10 + image: docker.io/bitnami/express:4 command: npm run development environment: - PORT=3000 diff --git a/bitnami/express/docker-compose.yml b/bitnami/express/docker-compose.yml index 6919f876d93a..09793b284d8f 100644 --- a/bitnami/express/docker-compose.yml +++ b/bitnami/express/docker-compose.yml @@ -2,11 +2,11 @@ version: '2' services: mongodb: - image: 'docker.io/bitnami/mongodb:4.2-debian-10' + image: docker.io/bitnami/mongodb:4.2 express: tty: true # Enables debugging capabilities when attached to this container. - image: 'docker.io/bitnami/express:4-debian-10' + image: docker.io/bitnami/express:4 command: npm start environment: - PORT=3000