From 05244172552ab5c900e54cd1002de3a5264a3eb5 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 17 Jan 2020 10:16:00 +0000 Subject: [PATCH] 8.8.1-ol-7-r32 release --- bitnami/drupal-nginx/8/ol-7/Dockerfile | 21 +++++-------------- .../8/ol-7/prebuildfs/build/bitnami-user.sh | 6 ++++++ .../8/ol-7/prebuildfs/build/install-gosu.sh | 10 +++++++++ .../8/ol-7/prebuildfs/build/install-nami.sh | 7 +++++++ .../8/ol-7/prebuildfs/build/install-tini.sh | 17 +++++++++++++++ .../ol-7/prebuildfs/usr/local/bin/bitnami-pkg | 3 +++ 6 files changed, 48 insertions(+), 16 deletions(-) create mode 100755 bitnami/drupal-nginx/8/ol-7/prebuildfs/build/bitnami-user.sh create mode 100755 bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-gosu.sh create mode 100755 bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-nami.sh create mode 100755 bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-tini.sh diff --git a/bitnami/drupal-nginx/8/ol-7/Dockerfile b/bitnami/drupal-nginx/8/ol-7/Dockerfile index cc28f4a98b74..b00eda22ea6a 100644 --- a/bitnami/drupal-nginx/8/ol-7/Dockerfile +++ b/bitnami/drupal-nginx/8/ol-7/Dockerfile @@ -6,34 +6,23 @@ ENV PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/php/sbin:/opt/ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages GeoIP bzip2-libs ca-certificates curl cyrus-sasl-lib freetds-libs freetype glibc gmp gnutls gzip hostname keyutils-libs krb5-libs libaio-devel 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 procps-ng readline sudo tar which xz-libs zlib -RUN /bitnami-user.sh && \ - /install-nami.sh +RUN /build/bitnami-user.sh && \ + /build/install-nami.sh RUN bitnami-pkg unpack php-7.3.13-1 --checksum a2bb2a5ddd668c0662a12704747c5a6843f2ba05d03fb03f1e95140c33e14ffc RUN bitnami-pkg unpack nginx-1.16.1-4 --checksum 492b05515c2f72241dc9efa7d92d18ce58e54ea437d643b40ba5b2aaf5077142 RUN bitnami-pkg unpack mysql-client-10.3.21-0 --checksum 9e012f0e449a963c923c8ea7a5cc2ab2c688564ed910eaab2aef1ad70c5d8e4b RUN bitnami-pkg unpack drupal-8.8.1-1 --checksum 17c16ee526dfcc8b57345449b44a3900a92f6c70dff5b23b068208e23c08e214 RUN yum upgrade -y && \ rm -r /var/cache/yum -RUN curl --silent -L https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64 > /usr/local/bin/gosu && \ - echo 0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7 /usr/local/bin/gosu | sha256sum --check && \ - chmod u+x /usr/local/bin/gosu && \ - mkdir -p /opt/bitnami/licenses && \ - curl --silent -L https://raw.githubusercontent.com/tianon/gosu/master/LICENSE > /opt/bitnami/licenses/gosu-1.11.txt +RUN /build/install-gosu.sh RUN ln -sf /dev/stdout /opt/bitnami/nginx/logs/access.log RUN ln -sf /dev/stderr /opt/bitnami/nginx/logs/error.log -RUN for server in "ha.pool.sks-keyservers.net" "hkp://p80.pool.sks-keyservers.net:80" "keyserver.ubuntu.com" "hkp://keyserver.ubuntu.com:80" "pgp.mit.edu"; do gpg --keyserver $server --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; done && \ - gpg --fingerprint 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 | grep -q "6380 DC42 8747 F6C3 93FE ACA5 9A84 159D 7001 A4E5" && \ - curl --silent -L https://github.com/krallin/tini/releases/download/v0.13.2/tini.asc > /tmp/tini.asc && \ - curl --silent -L https://github.com/krallin/tini/releases/download/v0.13.2/tini > /usr/local/bin/tini && \ - gpg --verify /tmp/tini.asc /usr/local/bin/tini && \ - chmod +x /usr/local/bin/tini && \ - mkdir -p /opt/bitnami/licenses && \ - curl --silent -L https://raw.githubusercontent.com/krallin/tini/master/LICENSE > /opt/bitnami/licenses/tini-0.13.2.txt +RUN /build/install-tini.sh COPY rootfs / ENV ALLOW_EMPTY_PASSWORD="no" \ BITNAMI_APP_NAME="drupal-nginx" \ - BITNAMI_IMAGE_VERSION="8.8.1-ol-7-r31" \ + BITNAMI_IMAGE_VERSION="8.8.1-ol-7-r32" \ DRUPAL_DATABASE_NAME="bitnami_drupal" \ DRUPAL_DATABASE_PASSWORD="" \ DRUPAL_DATABASE_USER="bn_drupal" \ diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/bitnami-user.sh b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/bitnami-user.sh new file mode 100755 index 000000000000..ab84296bcdfa --- /dev/null +++ b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/bitnami-user.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +useradd -ms /bin/bash bitnami +mkdir -p /opt/bitnami && chown bitnami:bitnami /opt/bitnami +sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers +echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-gosu.sh b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-gosu.sh new file mode 100755 index 000000000000..1756700daa89 --- /dev/null +++ b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-gosu.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +VERSION="1.11" +SHA256="0b843df6d86e270c5b0f5cbd3c326a04e18f4b7f9b8457fa497b0454c4b138d7" + +curl --silent -L "https://github.com/tianon/gosu/releases/download/${VERSION}/gosu-amd64" > "/usr/local/bin/gosu" +echo "$SHA256" "/usr/local/bin/gosu" | sha256sum --check +chmod u+x "/usr/local/bin/gosu" +mkdir -p "/opt/bitnami/licenses" +curl --silent -L "https://raw.githubusercontent.com/tianon/gosu/master/LICENSE" > "/opt/bitnami/licenses/gosu-${VERSION}.txt" diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-nami.sh b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-nami.sh new file mode 100755 index 000000000000..d8a59c381f6d --- /dev/null +++ b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-nami.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-1.0.0-1-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz +echo "80488279b056d5e9c183fe34097c5f496715ab16a602afcc9f78d59f15139a16 /tmp/nami-linux-x64.tar.gz" | sha256sum --check +mkdir -p /opt/bitnami/nami /opt/bitnami/licenses +tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && rm /tmp/nami-linux-x64.tar.gz +curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-1.0.0-1.txt diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-tini.sh b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-tini.sh new file mode 100755 index 000000000000..8376a36aee5f --- /dev/null +++ b/bitnami/drupal-nginx/8/ol-7/prebuildfs/build/install-tini.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +GPG_KEY="595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7" +GPG_KEY_FINGERPRINT="6380 DC42 8747 F6C3 93FE ACA5 9A84 159D 7001 A4E5" +SERVERS=("ha.pool.sks-keyservers.net" "hkp://p80.pool.sks-keyservers.net:80" "keyserver.ubuntu.com" "hkp://keyserver.ubuntu.com:80" "pgp.mit.edu") +VERSION="0.13.2" + +for server in "${SERVERS[@]}"; do + gpg --keyserver "$server" --recv-keys "$GPG_KEY" && break || : +done +gpg --fingerprint "$GPG_KEY" | grep -q "$GPG_KEY_FINGERPRINT" +curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini.asc" > "/tmp/tini.asc" +curl --silent -L "https://github.com/krallin/tini/releases/download/v${VERSION}/tini" > "/usr/local/bin/tini" +gpg --verify "/tmp/tini.asc" "/usr/local/bin/tini" +chmod +x "/usr/local/bin/tini" +mkdir -p "/opt/bitnami/licenses" +curl --silent -L "https://raw.githubusercontent.com/krallin/tini/master/LICENSE" > "/opt/bitnami/licenses/tini-${VERSION}.txt" diff --git a/bitnami/drupal-nginx/8/ol-7/prebuildfs/usr/local/bin/bitnami-pkg b/bitnami/drupal-nginx/8/ol-7/prebuildfs/usr/local/bin/bitnami-pkg index 0d68b3eda1cc..3d934df5585a 100755 --- a/bitnami/drupal-nginx/8/ol-7/prebuildfs/usr/local/bin/bitnami-pkg +++ b/bitnami/drupal-nginx/8/ol-7/prebuildfs/usr/local/bin/bitnami-pkg @@ -57,6 +57,9 @@ identify_arch() { ol-*) arch=x86_64 ;; + centos-*) + arch=x86_64 + ;; rhel-*) arch=x86_64 ;;