8.5.3-rhel-7-r0 release

Remove libphp dependency from Drupal module

bitnami/drupal/8/rhel-7/Dockerfile

@@ -0,0 +1,46 @@
+FROM gcr.io/helm-publish-ci/redhat-extras:7-r3
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
+    BITNAMI_PKG_EXTRA_DIRS="/bitnami/apache/conf /opt/bitnami/apache/tmp /opt/bitnami/apache/conf" \
+    HOME="/"
+
+# 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-3 --checksum c9ed08e5c752fe23eff64d19f1e2a4a34f6326732acc80ea685f2d8eda7ee96f
+RUN bitnami-pkg unpack php-7.1.18-0 --checksum b644ba392f6b673c5beea17e9358f213648b8c7525f876c6d6f64e2ee7efe839
+RUN bitnami-pkg unpack mysql-client-10.1.33-0 --checksum 4b07acdb7d3f6a61161414ad7f7639da8f291962e242eb257f612d18c8231501
+RUN bitnami-pkg install libphp-7.1.18-0 --checksum 333c8861a9f35ec48359a96cc9c5a3ceee51ad865db0292dd7867e950a0eea70
+RUN bitnami-pkg unpack drupal-8.5.3-3 --checksum d716a107a08ad38faff4761ac7e47431cef544ee693087e5f19272ba6b082a5f
+RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log
+RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/error_log
+
+COPY rootfs /
+ENV ALLOW_EMPTY_PASSWORD="no" \
+    APACHE_HTTPS_PORT_NUMBER="8443" \
+    APACHE_HTTP_PORT_NUMBER="8080" \
+    BITNAMI_APP_NAME="drupal" \
+    BITNAMI_IMAGE_VERSION="8.5.3-rhel-7-r0" \
+    DRUPAL_DATABASE_NAME="bitnami_drupal" \
+    DRUPAL_DATABASE_PASSWORD="" \
+    DRUPAL_DATABASE_USER="bn_drupal" \
+    DRUPAL_EMAIL="user@example.com" \
+    DRUPAL_HTTPS_PORT="8443" \
+    DRUPAL_HTTP_PORT="8080" \
+    DRUPAL_PASSWORD="bitnami" \
+    DRUPAL_USERNAME="user" \
+    MARIADB_HOST="mariadb" \
+    MARIADB_PORT_NUMBER="3306" \
+    MARIADB_ROOT_PASSWORD="" \
+    MARIADB_ROOT_USER="root" \
+    MYSQL_CLIENT_CREATE_DATABASE_NAME="" \
+    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:/opt/bitnami/drupal/vendor/bin:$PATH"
+
+EXPOSE 8080 8443
+
+USER 1001
+ENTRYPOINT ["/app-entrypoint.sh"]
+CMD ["httpd","-f","/bitnami/apache/conf/httpd.conf","-DFOREGROUND"]

bitnami/drupal/8/rhel-7/docker-compose.yml

@@ -0,0 +1,32 @@
+version: '2'
+
+services:
+  mariadb:
+    image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+      - MARIADB_USER=bn_drupal
+      - MARIADB_DATABASE=bitnami_drupal
+    volumes:
+      - 'mariadb_data:/bitnami'
+  drupal:
+    image: 'bitnami/drupal:8-rhel-7'
+    environment:
+      - MARIADB_HOST=mariadb
+      - MARIADB_PORT_NUMBER=3306
+      - DRUPAL_DATABASE_USER=bn_drupal
+      - DRUPAL_DATABASE_NAME=bitnami_drupal
+      - ALLOW_EMPTY_PASSWORD=yes
+    ports:
+      - '80:8080'
+      - '443:8443'
+    volumes:
+      - 'drupal_data:/bitnami'
+    depends_on:
+      - mariadb
+
+volumes:
+  mariadb_data:
+    driver: local
+  drupal_data:
+    driver: local

bitnami/drupal/8/rhel-7/rootfs/apache-inputs.json

@@ -0,0 +1,4 @@
+{
+  "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}",
+  "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}"
+}

bitnami/drupal/8/rhel-7/rootfs/app-entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+print_welcome_page
+
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "httpd" ]]; then
+  . /init.sh
+  nami_initialize apache php mysql-client drupal
+  info "Starting drupal... "
+fi
+
+exec tini -- "$@"

bitnami/drupal/8/rhel-7/rootfs/drupal-inputs.json

@@ -0,0 +1,12 @@
+{
+  "databaseName": "{{$global.env.DRUPAL_DATABASE_NAME}}",
+  "databasePassword": "{{$global.env.DRUPAL_DATABASE_PASSWORD}}",
+  "databaseServerHost": "{{$global.env.MARIADB_HOST}}",
+  "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}",
+  "databaseUser": "{{$global.env.DRUPAL_DATABASE_USER}}",
+  "email": "{{$global.env.DRUPAL_EMAIL}}",
+  "httpPort": "{{$global.env.DRUPAL_HTTP_PORT}}",
+  "httpsPort": "{{$global.env.DRUPAL_HTTPS_PORT}}",
+  "password": "{{$global.env.DRUPAL_PASSWORD}}",
+  "username": "{{$global.env.DRUPAL_USERNAME}}"
+}

bitnami/drupal/8/rhel-7/rootfs/init.sh

@@ -0,0 +1,29 @@
+##
+## @brief     Helper function to show an error when a password is empty and exit
+## param $1   Input name
+##
+empty_password_error() {
+  error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development."
+  exit 1
+}
+
+##
+## @brief     Helper function to show a warning when the ALLOW_EMPTY_PASSWORD flag is enabled
+##
+empty_password_enabled_warn() {
+  warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment."
+}
+
+# Validate passwords
+if [[ "$ALLOW_EMPTY_PASSWORD" =~ ^(yes|Yes|YES)$ ]]; then
+  empty_password_enabled_warn
+else
+  # Database creation by MySQL client
+  if [[ -n "$MYSQL_CLIENT_CREATE_DATABASE_USER" && -z "$MYSQL_CLIENT_CREATE_DATABASE_PASSWORD" ]]; then
+    empty_password_error MYSQL_CLIENT_CREATE_DATABASE_PASSWORD
+  fi
+  # WordPress database
+  if [[ -z "$WORDPRESS_DATABASE_PASSWORD" ]]; then
+    empty_password_error WORDPRESS_DATABASE_PASSWORD
+  fi
+fi

bitnami/drupal/8/rhel-7/rootfs/mysql-client-inputs.json

@@ -0,0 +1,11 @@
+{
+  "allowEmptyPassword": "{{$global.env.ALLOW_EMPTY_PASSWORD}}",
+  "createDatabaseName": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_NAME}}",
+  "createDatabasePassword": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PASSWORD}}",
+  "createDatabasePrivileges": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES}}",
+  "createDatabaseUser": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_USER}}",
+  "host": "{{$global.env.MARIADB_HOST}}",
+  "port": "{{$global.env.MARIADB_PORT_NUMBER}}",
+  "rootPassword": "{{$global.env.MARIADB_ROOT_PASSWORD}}",
+  "rootUser": "{{$global.env.MARIADB_ROOT_USER}}"
+}

bitnami/drupal/README.md

@@ -23,6 +23,12 @@ $ docker-compose up -d
 * Bitnami images are built on CircleCI and automatically pushed to the Docker Hub.
 * All our images are based on [minideb](https://github.com/bitnami/minideb) a minimalist Debian based container image which gives you a small base container image and the familiarity of a leading linux distribution.
 
+# Supported tags and respective `Dockerfile` links
+
+* [`8`, `8.5.3-r26`, `latest` (8/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.3-r26/8/Dockerfile)
+
+Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).
+
 # Prerequisites
 
 To run this application you need Docker Engine 1.10.0. Docker Compose is recommended with a version 1.6.0 or later.

bitnami/drupal/circle.yml

@@ -7,6 +7,7 @@ jobs:
         environment:
           RELEASE_SERIES_LIST: "8"
           LATEST_STABLE: "8"
+          DISTRIBUTIONS_LIST: "debian-8"
           IMAGE_NAME: drupal
           CHART_NAME: drupal
           CHART_REPO: https://github.com/kubernetes/charts
@@ -63,4 +64,4 @@ workflows:
             branches:
               only: /.*/
             tags:
-              only: /^[0-9].*-r[0-9]+$/
+              only: /^[0-9].*-r[0-9]+(-(?!rhel).*)?$/