From b37085fc92dc985978a6aef0e1eaaf3f93ccc31a Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 27 Jul 2018 10:35:59 +0000 Subject: [PATCH] 4.9.7-php5-rhel-7-r1 release --- bitnami/wordpress/4-php5/rhel-7/Dockerfile | 16 ++++++++-------- .../4-php5/rhel-7/rootfs/app-entrypoint.sh | 2 +- bitnami/wordpress/4-php5/rhel-7/rootfs/run.sh | 13 +++++++++++++ bitnami/wordpress/README.md | 4 ++-- 4 files changed, 24 insertions(+), 11 deletions(-) create mode 100755 bitnami/wordpress/4-php5/rhel-7/rootfs/run.sh diff --git a/bitnami/wordpress/4-php5/rhel-7/Dockerfile b/bitnami/wordpress/4-php5/rhel-7/Dockerfile index 98aa1dddf5be..8ae109f480e3 100644 --- a/bitnami/wordpress/4-php5/rhel-7/Dockerfile +++ b/bitnami/wordpress/4-php5/rhel-7/Dockerfile @@ -1,4 +1,4 @@ -FROM gcr.io/helm-publish-ci/redhat-extras:7-r22 +FROM gcr.io/helm-publish-ci/redhat-extras:7-r45 LABEL maintainer "Bitnami " ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ @@ -7,11 +7,11 @@ 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.33-4 --checksum cc2b7ea816858476f7cb475e1319219b88461af51a25e6ba96592e0bb560e9ca -RUN bitnami-pkg unpack php-5.6.36-6 --checksum b524d2966cfc833b9fa3b598fd1a04396b398f2760dc8090f5606ed711156183 +RUN bitnami-pkg unpack apache-2.4.34-1 --checksum cdaa4e89b26534999debc5d7dc1b34d76fd42ea986e40941d276c0ad24c4016d +RUN bitnami-pkg unpack php-5.6.37-0 --checksum b8a15abc0b10812ad6a022ee8a37551daef09ebb1fbcfa44d1cc65e807aa229c RUN bitnami-pkg unpack mysql-client-10.1.33-0 --checksum 4b07acdb7d3f6a61161414ad7f7639da8f291962e242eb257f612d18c8231501 -RUN bitnami-pkg install libphp-5.6.36-5 --checksum 57807116b44a2b70f7e05de89464678e1db2d5aa29a261378f80315208e3b7d1 -RUN bitnami-pkg unpack wordpress-4.9.7-0 --checksum 607ff63ad0bc3ea6f6b805ed57b7cdf9f6788f3a868a1796125d8b4ca617dfee +RUN bitnami-pkg install libphp-5.6.37-0 --checksum cf697ebb69ece27a31fe486af0e2d8710ca2dc98358047dd7f43f8b8f8553da4 +RUN bitnami-pkg unpack wordpress-4.9.7-1 --checksum c570454b241f9b7ae6a4b0e823c31f03544d2c559042e2989de511dde1e017a2 RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/error_log @@ -20,7 +20,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="8443" \ APACHE_HTTP_PORT_NUMBER="8080" \ BITNAMI_APP_NAME="wordpress" \ - BITNAMI_IMAGE_VERSION="4.9.7-php5-rhel-7-r0" \ + BITNAMI_IMAGE_VERSION="4.9.7-php5-rhel-7-r1" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ @@ -29,7 +29,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ MYSQL_CLIENT_CREATE_DATABASE_PASSWORD="" \ MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES="ALL" \ MYSQL_CLIENT_CREATE_DATABASE_USER="" \ - PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin:$PATH" \ + PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:$PATH" \ SMTP_HOST="" \ SMTP_PASSWORD="" \ SMTP_PORT="" \ @@ -54,4 +54,4 @@ EXPOSE 8080 8443 USER 1001 ENTRYPOINT ["/app-entrypoint.sh"] -CMD ["httpd","-f","/bitnami/apache/conf/httpd.conf","-DFOREGROUND"] +CMD ["/run.sh"] diff --git a/bitnami/wordpress/4-php5/rhel-7/rootfs/app-entrypoint.sh b/bitnami/wordpress/4-php5/rhel-7/rootfs/app-entrypoint.sh index b6df73d14b31..bea4606d7f07 100755 --- a/bitnami/wordpress/4-php5/rhel-7/rootfs/app-entrypoint.sh +++ b/bitnami/wordpress/4-php5/rhel-7/rootfs/app-entrypoint.sh @@ -5,7 +5,7 @@ print_welcome_page -if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "httpd" ]]; then +if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then . /init.sh nami_initialize apache php mysql-client wordpress info "Starting wordpress... " diff --git a/bitnami/wordpress/4-php5/rhel-7/rootfs/run.sh b/bitnami/wordpress/4-php5/rhel-7/rootfs/run.sh new file mode 100755 index 000000000000..4d00ab93cfcc --- /dev/null +++ b/bitnami/wordpress/4-php5/rhel-7/rootfs/run.sh @@ -0,0 +1,13 @@ +#!/bin/bash +. /opt/bitnami/base/functions +. /opt/bitnami/base/helpers + +DAEMON=httpd +EXEC=$(which $DAEMON) +ARGS="-f /opt/bitnami/apache/conf/httpd.conf -D FOREGROUND" + +# create apache tmp directory +mkdir /opt/bitnami/apache/tmp + +info "Starting ${DAEMON}..." +exec ${EXEC} ${ARGS} diff --git a/bitnami/wordpress/README.md b/bitnami/wordpress/README.md index 18301a1e4818..bf9a3dc9f0a6 100644 --- a/bitnami/wordpress/README.md +++ b/bitnami/wordpress/README.md @@ -29,8 +29,8 @@ $ docker-compose up * [`4-rhel-7`, `4.9.7-rhel-7-r1` (4/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.7-rhel-7-r1/4/rhel-7/Dockerfile) -* [`4-php5-rhel-7`, `4.9.7-php5-rhel-7-r0` (4-php5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.7-php5-rhel-7-r0/4-php5/rhel-7/Dockerfile) -* [`4-ol-7`, `4.9.7-ol-7-r19` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.7-ol-7-r19/4/ol-7/Dockerfile) +* [`4-php5-rhel-7`, `4.9.7-php5-rhel-7-r1` (4-php5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.7-php5-rhel-7-r1/4-php5/rhel-7/Dockerfile) +* [`4-ol-7`, `4.9.7-ol-7-r18` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.7-ol-7-r18/4/ol-7/Dockerfile) * [`4-debian-9`, `4.9.7-debian-9-r21`, `4`, `4.9.7`, `4.9.7-r21`, `latest` (4/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.7-debian-9-r21/4/Dockerfile) Subscribe to project updates by watching the [bitnami/wordpress GitHub repo](https://github.com/bitnami/bitnami-docker-wordpress).