From b34867d8d74bef1af8ae76535e9080721b450fdf Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Hernandez Date: Wed, 7 Nov 2018 16:17:03 +0100 Subject: [PATCH] Update drupal apache php 5 including latest changes --- bitnami/drupal/8-php5/rhel-7/Dockerfile | 13 +++++++------ bitnami/drupal/8-php5/rhel-7/rootfs/run.sh | 4 ---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/bitnami/drupal/8-php5/rhel-7/Dockerfile b/bitnami/drupal/8-php5/rhel-7/Dockerfile index 740990cf705f..ff011fa7c520 100644 --- a/bitnami/drupal/8-php5/rhel-7/Dockerfile +++ b/bitnami/drupal/8-php5/rhel-7/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/helm-publish-ci/redhat-extras:7-r126 +FROM registry.rhc4tp.openshift.com/ospid-21274491-b512-4b83-9779-e3c7978039fb/partner-build-service:7-r114 LABEL maintainer "Bitnami " ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ @@ -7,13 +7,14 @@ ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ # Install required system packages and dependencies RUN install_packages bzip2-libs cyrus-sasl-lib expat freetype glibc gmp keyutils-libs krb5-libs libcom_err libcurl libgcc libgcrypt libgpg-error libicu libidn libjpeg-turbo libpng libselinux libssh2 libstdc++ libxml2 libxslt ncurses-libs nspr nss nss-softokn-freebl nss-util openldap openssl-libs pcre postgresql-libs readline sqlite xz-libs zlib -RUN bitnami-pkg unpack apache-2.4.35-0 --checksum 27c21bf58f3de5f36aab8db3ccba8b8075c05a7c9ac5e4d26343fd6906cf29e1 +RUN bitnami-pkg unpack apache-2.4.37-1 --checksum 0be48a8445346b61820b03a8833966eb5335bdd392801b7cb7d91a5a9c50e60c RUN bitnami-pkg unpack php-5.6.38-2 --checksum 03ae59ec97f59c6b7f9c3043fff8b4485b6ad75502de492b46da7ab2a447025d -RUN bitnami-pkg unpack mysql-client-10.1.36-0 --checksum 46075d029b7e2537f7b9f13b4662a7539230bd2801c89087c675bc3efa98d839 -RUN bitnami-pkg unpack libphp-5.6.38-1 --checksum 10d6d75e59ed466d8b1c6f2ac27c4913e6dd576d03d14823d7c408c2d927e7d6 -RUN bitnami-pkg unpack drupal-8.6.1-1 --checksum 3fda81c1caac872c86708978e4a2b9e6845dd668a24913811a794dec704e01ff +RUN bitnami-pkg unpack mysql-client-10.1.36-1 --checksum e13014dbb969bfa2469f45694112e9b62fe886753899c8bc2cfd32705af999d9 +RUN bitnami-pkg install libphp-5.6.38-2 --checksum 3a071c80731ac56d0889366c74381a9fa36f7cc1555c03d4f3ebfc7c18c8b342 +RUN bitnami-pkg unpack drupal-8.6.2-1 --checksum e74f010ce44dab91635bada39b0485cbbb34502b053eea45bea9cba67edacf9c +RUN mkdir -p /opt/bitnami/apache/tmp && chmod g+rwX /opt/bitnami/apache/tmp RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log -RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/error_log +RUN ln -sf /dev/stderr /opt/bitnami/apache/logs/error_log COPY rootfs / ENV ALLOW_EMPTY_PASSWORD="no" \ diff --git a/bitnami/drupal/8-php5/rhel-7/rootfs/run.sh b/bitnami/drupal/8-php5/rhel-7/rootfs/run.sh index ba2fcde33e7e..4d00ab93cfcc 100755 --- a/bitnami/drupal/8-php5/rhel-7/rootfs/run.sh +++ b/bitnami/drupal/8-php5/rhel-7/rootfs/run.sh @@ -6,10 +6,6 @@ DAEMON=httpd EXEC=$(which $DAEMON) ARGS="-f /opt/bitnami/apache/conf/httpd.conf -D FOREGROUND" -# redirect apache logs to stdout/stderr -ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log -ln -sf /dev/stdout /opt/bitnami/apache/logs/error_log - # create apache tmp directory mkdir /opt/bitnami/apache/tmp