From a0bb17348df6bf886af64f96a4d0a951a1a4e18a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 7 May 2020 14:39:48 +0000 Subject: [PATCH] 3.1.11-debian-10-r100 release --- bitnami/codeigniter/3/debian-10/Dockerfile | 15 +++++++----- .../3/debian-10/docker-compose.yml | 4 ++-- .../prebuildfs/usr/sbin/install_packages | 24 +++++++++++++++++++ .../3/debian-10/rootfs/app-entrypoint.sh | 9 ------- bitnami/codeigniter/README.md | 2 +- bitnami/codeigniter/docker-compose.yml | 4 ++-- 6 files changed, 38 insertions(+), 20 deletions(-) create mode 100755 bitnami/codeigniter/3/debian-10/prebuildfs/usr/sbin/install_packages diff --git a/bitnami/codeigniter/3/debian-10/Dockerfile b/bitnami/codeigniter/3/debian-10/Dockerfile index bf174b8760a0..f93771735132 100644 --- a/bitnami/codeigniter/3/debian-10/Dockerfile +++ b/bitnami/codeigniter/3/debian-10/Dockerfile @@ -1,16 +1,16 @@ FROM docker.io/bitnami/minideb:buster LABEL maintainer "Bitnami " -ENV PATH="/opt/bitnami/common/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/codeigniter/bin:/opt/bitnami/nami/bin:$PATH" +ENV PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/codeigniter/bin:/opt/bitnami/nami/bin:$PATH" COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl dirmngr gnupg libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 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 libjemalloc2 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 libnettle6 libnghttp2-14 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 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 gnupg gzip libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 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 libjemalloc2 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 libnettle6 libnghttp2-14 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 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 install tini-0.19.0-0 --checksum 9a8ae20be31a518f042fcec359f2cf35bfdb4e2a56f2fa8ff9ef2ecaf45da80c -RUN bitnami-pkg unpack php-7.3.17-1 --checksum 7dd49d5a720cb3e18373b7089dece825ad06b63acabadef9129ff22128bb26c9 +RUN bitnami-pkg install php-7.3.17-1 --checksum 7dd49d5a720cb3e18373b7089dece825ad06b63acabadef9129ff22128bb26c9 RUN bitnami-pkg install mysql-client-10.3.22-1 --checksum e9fa94f574c87d15f0b6aba7cff1c06f70c0e69c1c442378c9961fc148fa68ef +RUN bitnami-pkg install tini-0.19.0-0 --checksum 9a8ae20be31a518f042fcec359f2cf35bfdb4e2a56f2fa8ff9ef2ecaf45da80c RUN bitnami-pkg install gosu-1.12.0-0 --checksum 582d501eeb6b338a24f417fededbf14295903d6be55c52d66c52e616c81bcd8c RUN bitnami-pkg install codeigniter-3.1.11-0 --checksum 349fc44d9aeaece26f3ffabcb31c52d1fda8d94d0c2f09e66a99befdb90ec99b RUN apt-get update && apt-get upgrade -y && \ @@ -18,11 +18,14 @@ RUN apt-get update && apt-get upgrade -y && \ COPY rootfs / ENV BITNAMI_APP_NAME="codeigniter" \ - BITNAMI_IMAGE_VERSION="3.1.11-debian-10-r99" \ + BITNAMI_IMAGE_VERSION="3.1.11-debian-10-r100" \ CODEIGNITER_PROJECT_NAME="myapp" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ - MARIADB_USER="root" + MARIADB_USER="root" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" EXPOSE 8000 diff --git a/bitnami/codeigniter/3/debian-10/docker-compose.yml b/bitnami/codeigniter/3/debian-10/docker-compose.yml index 2da567210a4d..643bce929afe 100644 --- a/bitnami/codeigniter/3/debian-10/docker-compose.yml +++ b/bitnami/codeigniter/3/debian-10/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: myapp: - image: 'bitnami/codeigniter:3' + image: 'docker.io/bitnami/codeigniter:3-debian-10' ports: - '8000:8000' volumes: @@ -9,6 +9,6 @@ services: depends_on: - mariadb mariadb: - image: 'bitnami/mariadb:10.3' + image: 'docker.io/bitnami/mariadb:10.3-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes diff --git a/bitnami/codeigniter/3/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/codeigniter/3/debian-10/prebuildfs/usr/sbin/install_packages new file mode 100755 index 000000000000..c9577647443b --- /dev/null +++ b/bitnami/codeigniter/3/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/codeigniter/3/debian-10/rootfs/app-entrypoint.sh b/bitnami/codeigniter/3/debian-10/rootfs/app-entrypoint.sh index aaa69412eb51..37d0f22cc7db 100755 --- a/bitnami/codeigniter/3/debian-10/rootfs/app-entrypoint.sh +++ b/bitnami/codeigniter/3/debian-10/rootfs/app-entrypoint.sh @@ -5,9 +5,6 @@ print_welcome_page -if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "php" ]]; then - #!/bin/bash - PROJECT_DIRECTORY=/app/$CODEIGNITER_PROJECT_NAME DEPLOY=("$@") @@ -26,9 +23,3 @@ if [[ "$1" = "php" && "$2" = "-S" ]]; then fi exec tini -- "${DEPLOY[@]}" - - nami_initialize php - info "Starting codeigniter... " -fi - -exec tini -- "$@" diff --git a/bitnami/codeigniter/README.md b/bitnami/codeigniter/README.md index 801ddd3cffd3..d9c41bdaa5ee 100644 --- a/bitnami/codeigniter/README.md +++ b/bitnami/codeigniter/README.md @@ -36,7 +36,7 @@ The Bitnami CodeIgniter Development Container has been carefully engineered to p 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/). -* [`3-debian-10`, `3.1.11-debian-10-r99`, `3`, `3.1.11`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-codeigniter/blob/3.1.11-debian-10-r99/3/debian-10/Dockerfile) +* [`3-debian-10`, `3.1.11-debian-10-r100`, `3`, `3.1.11`, `latest` (3/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-codeigniter/blob/3.1.11-debian-10-r100/3/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/codeigniter GitHub repo](https://github.com/bitnami/bitnami-docker-codeigniter). diff --git a/bitnami/codeigniter/docker-compose.yml b/bitnami/codeigniter/docker-compose.yml index 2da567210a4d..643bce929afe 100644 --- a/bitnami/codeigniter/docker-compose.yml +++ b/bitnami/codeigniter/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: myapp: - image: 'bitnami/codeigniter:3' + image: 'docker.io/bitnami/codeigniter:3-debian-10' ports: - '8000:8000' volumes: @@ -9,6 +9,6 @@ services: depends_on: - mariadb mariadb: - image: 'bitnami/mariadb:10.3' + image: 'docker.io/bitnami/mariadb:10.3-debian-10' environment: - ALLOW_EMPTY_PASSWORD=yes