diff --git a/bitnami/codeigniter/3/ol-7/Dockerfile b/bitnami/codeigniter/3/ol-7/Dockerfile index 1f0b00affee2..02695158860e 100644 --- a/bitnami/codeigniter/3/ol-7/Dockerfile +++ b/bitnami/codeigniter/3/ol-7/Dockerfile @@ -1,6 +1,7 @@ -FROM bitnami/oraclelinux-extras:7-r573 +FROM bitnami/oraclelinux-extras:7-r574 LABEL maintainer "Bitnami " +COPY prebuildfs / # Install required system packages and dependencies RUN install_packages bzip2-libs cyrus-sasl-lib freetds-libs freetype glibc gmp gnutls keyutils-libs krb5-libs libcom_err libcurl libffi libgcc libgcrypt libgpg-error libicu libidn libjpeg-turbo libmemcached libpng libselinux libssh2 libstdc++ libtasn1 libtidy libxml2 libxslt ncurses-libs nettle nspr nss nss-softokn-freebl nss-util openldap openssl-libs p11-kit pcre postgresql-libs readline xz-libs zlib RUN bitnami-pkg unpack php-7.3.13-0 --checksum a51ab66c0ae1dd1503084b35380659069ba03fe2644e2034752b346c87b3c89e @@ -9,7 +10,7 @@ RUN bitnami-pkg install codeigniter-3.1.11-1 --checksum 688a0ac5b62282e30398fa20 COPY rootfs / ENV BITNAMI_APP_NAME="codeigniter" \ - BITNAMI_IMAGE_VERSION="3.1.11-ol-7-r100" \ + BITNAMI_IMAGE_VERSION="3.1.11-ol-7-r101" \ CODEIGNITER_PROJECT_NAME="myapp" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ diff --git a/bitnami/codeigniter/3/ol-7/prebuildfs/usr/local/bin/install_packages b/bitnami/codeigniter/3/ol-7/prebuildfs/usr/local/bin/install_packages new file mode 100755 index 000000000000..370f3516f403 --- /dev/null +++ b/bitnami/codeigniter/3/ol-7/prebuildfs/usr/local/bin/install_packages @@ -0,0 +1,29 @@ +#!/bin/sh +set -eu + +if [[ -n "oracle-epel-release-el7" ]]; then + if ! yum list installed oracle-epel-release-el7 >/dev/null 2>&1; then + yum -y install oracle-epel-release-el7 >/dev/null 2>&1 + CODE=$? + if (( $CODE != 0 )); then + echo "EPEL repository installation failed" + exit $CODE + fi + fi +fi + +max=2 +for ((n = 1 ; n <= max ; n+=1 )); do + set +e + yum --enablerepo base,updates,ol7_developer_EPEL,ol7_optional_latest install -y "$@" + CODE=$? + set -e + if (( $CODE == 0 )); then + break + fi + if (( $n == $max )); then + exit $CODE + fi + echo "yum failed, retrying" +done +rm -r /var/cache/yum diff --git a/bitnami/codeigniter/README.md b/bitnami/codeigniter/README.md index f48707f8efc4..6992ffa32765 100644 --- a/bitnami/codeigniter/README.md +++ b/bitnami/codeigniter/README.md @@ -50,7 +50,7 @@ $ kubectl apply -f test.yaml Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/). -* [`3-ol-7`, `3.1.11-ol-7-r100` (3/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-codeigniter/blob/3.1.11-ol-7-r100/3/ol-7/Dockerfile) +* [`3-ol-7`, `3.1.11-ol-7-r101` (3/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-codeigniter/blob/3.1.11-ol-7-r101/3/ol-7/Dockerfile) * [`3-debian-9`, `3.1.11-debian-9-r87`, `3`, `3.1.11`, `3.1.11-r87`, `latest` (3/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-codeigniter/blob/3.1.11-debian-9-r87/3/debian-9/Dockerfile) Subscribe to project updates by watching the [bitnami/codeigniter GitHub repo](https://github.com/bitnami/bitnami-docker-codeigniter).