From a38b55173a42a2e318c9a2b3c87ebcb72e3d8227 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 20 May 2020 19:49:02 +0000 Subject: [PATCH] 7.12.0-debian-10-r1 release --- bitnami/laravel/7/debian-10/Dockerfile | 11 +++++---- .../laravel/7/debian-10/docker-compose.yml | 4 ++-- .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ bitnami/laravel/README.md | 2 +- bitnami/laravel/docker-compose.yml | 4 ++-- 5 files changed, 36 insertions(+), 9 deletions(-) create mode 100755 bitnami/laravel/7/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/laravel/7/debian-10/Dockerfile b/bitnami/laravel/7/debian-10/Dockerfile index 64b5c4fa38ec..d6364ecd6f8f 100644 --- a/bitnami/laravel/7/debian-10/Dockerfile +++ b/bitnami/laravel/7/debian-10/Dockerfile @@ -1,11 +1,11 @@ FROM docker.io/bitnami/minideb:buster LABEL maintainer "Bitnami " -ENV PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/node/bin:/opt/bitnami/common/bin:/opt/bitnami/laravel/bin:/opt/bitnami/nami/bin:$PATH" +ENV PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/node/bin:/opt/bitnami/common/bin:/opt/bitnami/nami/bin:$PATH" COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl dirmngr ghostscript gnupg imagemagick libbsd0 libbz2-1.0 libc6 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libncursesw6 libnettle6 libnghttp2-14 libp11-kit0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sudo unzip zlib1g +RUN install_packages ca-certificates curl dirmngr ghostscript gnupg gzip imagemagick libbsd0 libbz2-1.0 libc6 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libncursesw6 libnettle6 libnghttp2-14 libp11-kit0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sudo tar zlib1g RUN /build/bitnami-user.sh RUN /build/install-nami.sh RUN bitnami-pkg unpack php-7.3.18-0 --checksum 279b5b626de773d0216749aa8046477015276575f1c2a369ca0b0f054e4a68b5 @@ -19,8 +19,11 @@ RUN mkdir /app && chown bitnami:bitnami /app COPY rootfs / ENV BITNAMI_APP_NAME="laravel" \ - BITNAMI_IMAGE_VERSION="7.12.0-debian-10-r0" \ - NODE_PATH="/opt/bitnami/node/lib/node_modules" + BITNAMI_IMAGE_VERSION="7.12.0-debian-10-r1" \ + NODE_PATH="/opt/bitnami/node/lib/node_modules" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" EXPOSE 3000 diff --git a/bitnami/laravel/7/debian-10/docker-compose.yml b/bitnami/laravel/7/debian-10/docker-compose.yml index d7dd7a504f21..5a3f6f07d890 100644 --- a/bitnami/laravel/7/debian-10/docker-compose.yml +++ b/bitnami/laravel/7/debian-10/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: mariadb: - image: 'bitnami/mariadb:10.1' + image: 'docker.io/bitnami/mariadb:10.1-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes - MARIADB_USER=my_user @@ -11,7 +11,7 @@ services: myapp: tty: true - image: bitnami/laravel:7 + image: docker.io/bitnami/laravel:7-debian-10 environment: - DB_HOST=mariadb - DB_USERNAME=my_user diff --git a/bitnami/laravel/7/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/laravel/7/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/laravel/7/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/laravel/README.md b/bitnami/laravel/README.md index cb1e54786a69..d3e14833c04b 100644 --- a/bitnami/laravel/README.md +++ b/bitnami/laravel/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/). -* [`7-debian-10`, `7.12.0-debian-10-r0`, `7`, `7.12.0`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-laravel/blob/7.12.0-debian-10-r0/7/debian-10/Dockerfile) +* [`7-debian-10`, `7.12.0-debian-10-r1`, `7`, `7.12.0`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-laravel/blob/7.12.0-debian-10-r1/7/debian-10/Dockerfile) * [`6-debian-10`, `6.18.8-debian-10-r38`, `6`, `6.18.8` (6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-laravel/blob/6.18.8-debian-10-r38/6/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/rails GitHub repo](https://github.com/bitnami/bitnami-docker-laravel). diff --git a/bitnami/laravel/docker-compose.yml b/bitnami/laravel/docker-compose.yml index d7dd7a504f21..5a3f6f07d890 100644 --- a/bitnami/laravel/docker-compose.yml +++ b/bitnami/laravel/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: mariadb: - image: 'bitnami/mariadb:10.1' + image: 'docker.io/bitnami/mariadb:10.1-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes - MARIADB_USER=my_user @@ -11,7 +11,7 @@ services: myapp: tty: true - image: bitnami/laravel:7 + image: docker.io/bitnami/laravel:7-debian-10 environment: - DB_HOST=mariadb - DB_USERNAME=my_user