From ebae96afaec142289c40fbe52eb416660ef7ab48 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 17 Jan 2020 17:19:50 +0000 Subject: [PATCH] 7.11.10-debian-9-r44 release --- bitnami/suitecrm/7/debian-9/Dockerfile | 21 +++++-------------- .../debian-9/prebuildfs/build/bitnami-user.sh | 6 ++++++ .../debian-9/prebuildfs/build/install-gosu.sh | 10 +++++++++ .../debian-9/prebuildfs/build/install-nami.sh | 7 +++++++ .../debian-9/prebuildfs/build/install-tini.sh | 17 +++++++++++++++ .../debian-9/prebuildfs/usr/sbin/bitnami-pkg | 3 +++ bitnami/suitecrm/README.md | 2 +- 7 files changed, 49 insertions(+), 17 deletions(-) create mode 100755 bitnami/suitecrm/7/debian-9/prebuildfs/build/bitnami-user.sh create mode 100755 bitnami/suitecrm/7/debian-9/prebuildfs/build/install-gosu.sh create mode 100755 bitnami/suitecrm/7/debian-9/prebuildfs/build/install-nami.sh create mode 100755 bitnami/suitecrm/7/debian-9/prebuildfs/build/install-tini.sh diff --git a/bitnami/suitecrm/7/debian-9/Dockerfile b/bitnami/suitecrm/7/debian-9/Dockerfile index 2e2cd80ddf33..0da8c4a583ba 100644 --- a/bitnami/suitecrm/7/debian-9/Dockerfile +++ b/bitnami/suitecrm/7/debian-9/Dockerfile @@ -6,8 +6,8 @@ ENV PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/op COPY prebuildfs / # Install required system packages and dependencies RUN install_packages ca-certificates cron curl dirmngr gnupg libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu57 libidn11 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmemcached11 libmemcachedutil2 libncurses5 libnettle6 libnghttp2-14 libp11-kit0 libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.0.2 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5 libtinfo5 libunistring0 libxml2 libxslt1.1 libzip4 procps sudo unzip zlib1g -RUN /bitnami-user.sh && \ - /install-nami.sh +RUN /build/bitnami-user.sh && \ + /build/install-nami.sh RUN bitnami-pkg unpack apache-2.4.41-4 --checksum 496e9cc3e12fd38832aae5dc1873cb4593666e6146379f55b2312908917eb666 RUN bitnami-pkg unpack php-7.3.13-1 --checksum 6b8ab93e7b05a5675667509352383e773d7bd65c6e7b8e1f9705d743bfdc8745 RUN bitnami-pkg unpack mysql-client-10.3.21-0 --checksum 19c6b964f289772a4e5963e22929133fa65222f66752eb29af715ce3d0b7ef0e @@ -16,24 +16,13 @@ RUN bitnami-pkg unpack suitecrm-7.11.10-0 --checksum 54cb428a84b5bbaa5bf3b2064ab RUN apt-get update && apt-get upgrade && \ rm -r /var/lib/apt/lists /var/cache/apt/archives RUN sed -i -e '/pam_loginuid.so/ s/^#*/#/' /etc/pam.d/cron -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 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-gosu.sh +RUN /build/install-tini.sh COPY rootfs / ENV ALLOW_EMPTY_PASSWORD="no" \ BITNAMI_APP_NAME="suitecrm" \ - BITNAMI_IMAGE_VERSION="7.11.10-debian-9-r43" \ + BITNAMI_IMAGE_VERSION="7.11.10-debian-9-r44" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/suitecrm/7/debian-9/prebuildfs/build/bitnami-user.sh b/bitnami/suitecrm/7/debian-9/prebuildfs/build/bitnami-user.sh new file mode 100755 index 000000000000..ab84296bcdfa --- /dev/null +++ b/bitnami/suitecrm/7/debian-9/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/suitecrm/7/debian-9/prebuildfs/build/install-gosu.sh b/bitnami/suitecrm/7/debian-9/prebuildfs/build/install-gosu.sh new file mode 100755 index 000000000000..1756700daa89 --- /dev/null +++ b/bitnami/suitecrm/7/debian-9/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/suitecrm/7/debian-9/prebuildfs/build/install-nami.sh b/bitnami/suitecrm/7/debian-9/prebuildfs/build/install-nami.sh new file mode 100755 index 000000000000..d8a59c381f6d --- /dev/null +++ b/bitnami/suitecrm/7/debian-9/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/suitecrm/7/debian-9/prebuildfs/build/install-tini.sh b/bitnami/suitecrm/7/debian-9/prebuildfs/build/install-tini.sh new file mode 100755 index 000000000000..8376a36aee5f --- /dev/null +++ b/bitnami/suitecrm/7/debian-9/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/suitecrm/7/debian-9/prebuildfs/usr/sbin/bitnami-pkg b/bitnami/suitecrm/7/debian-9/prebuildfs/usr/sbin/bitnami-pkg index 0d68b3eda1cc..3d934df5585a 100755 --- a/bitnami/suitecrm/7/debian-9/prebuildfs/usr/sbin/bitnami-pkg +++ b/bitnami/suitecrm/7/debian-9/prebuildfs/usr/sbin/bitnami-pkg @@ -57,6 +57,9 @@ identify_arch() { ol-*) arch=x86_64 ;; + centos-*) + arch=x86_64 + ;; rhel-*) arch=x86_64 ;; diff --git a/bitnami/suitecrm/README.md b/bitnami/suitecrm/README.md index 4f3f41f36bf4..087353040f57 100644 --- a/bitnami/suitecrm/README.md +++ b/bitnami/suitecrm/README.md @@ -39,7 +39,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`7-ol-7`, `7.11.10-ol-7-r70` (7/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-suitecrm/blob/7.11.10-ol-7-r70/7/ol-7/Dockerfile) -* [`7-debian-9`, `7.11.10-debian-9-r43`, `7`, `7.11.10`, `7.11.10-r43`, `latest` (7/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-suitecrm/blob/7.11.10-debian-9-r43/7/debian-9/Dockerfile) +* [`7-debian-9`, `7.11.10-debian-9-r44`, `7`, `7.11.10`, `7.11.10-r44`, `latest` (7/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-suitecrm/blob/7.11.10-debian-9-r44/7/debian-9/Dockerfile) Subscribe to project updates by watching the [bitnami/suitecrm GitHub repo](https://github.com/bitnami/bitnami-docker-suitecrm).