8.5.3-ol-7-r0 release

Remove libphp dependency from Drupal module
2026-02-24 07:07:37 +08:00 · 2018-05-30 16:06:12 +00:00
parent 80abd99047
commit 486087b60b
10 changed files with 159 additions and 2 deletions
--- a/bitnami/drupal/8/ol-7/Dockerfile
+++ b/bitnami/drupal/8/ol-7/Dockerfile
@@ -0,0 +1,39 @@
+FROM bitnami/oraclelinux-extras:7-r3
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+# 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 0611709446389dbf1b9a08ee4b8b447443e356e286a9c6dee312d55f72e465d6
+RUN bitnami-pkg unpack php-7.1.18-0 --checksum ea15f7691a9da4e1613a18f5f49c5cc48b84bdd849d1ce27ea5e5e2dc99029dc
+RUN bitnami-pkg unpack mysql-client-10.1.33-0 --checksum 250e5cd0f6f256fb39e8d8b703856dbc0257f3da9659b8565398173a3119dd9c
+RUN bitnami-pkg install libphp-7.1.18-1 --checksum 538f68d6d196c3a58cc6147878f644ccc5055a916bb8693c349f5245fff164ee
+RUN bitnami-pkg unpack drupal-8.5.3-3 --checksum 268190edd771134dc3b4f81e72243309231969d21b09cc8cd43f13836869d6ae
+
+COPY rootfs /
+ENV ALLOW_EMPTY_PASSWORD="no" \
+    APACHE_HTTPS_PORT_NUMBER="443" \
+    APACHE_HTTP_PORT_NUMBER="80" \
+    BITNAMI_APP_NAME="drupal" \
+    BITNAMI_IMAGE_VERSION="8.5.3-ol-7-r0" \
+    DRUPAL_DATABASE_NAME="bitnami_drupal" \
+    DRUPAL_DATABASE_PASSWORD="" \
+    DRUPAL_DATABASE_USER="bn_drupal" \
+    DRUPAL_EMAIL="user@example.com" \
+    DRUPAL_HTTPS_PORT="443" \
+    DRUPAL_HTTP_PORT="80" \
+    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 80 443
+
+ENTRYPOINT ["/app-entrypoint.sh"]
+CMD ["./run.sh"]
--- a/bitnami/drupal/8/ol-7/docker-compose.yml
+++ b/bitnami/drupal/8/ol-7/docker-compose.yml
@@ -0,0 +1,30 @@
+version: '2'
+services:
+  mariadb:
+    image: 'bitnami/mariadb:latest'
+    volumes:
+      - 'mariadb_data:/bitnami'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+      - MARIADB_USER=bn_drupal
+      - MARIADB_DATABASE=bitnami_drupal
+  drupal:
+    image: 'bitnami/drupal:8-ol-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:80'
+      - '443:443'
+    volumes:
+      - 'drupal_data:/bitnami'
+    depends_on:
+      - mariadb
+volumes:
+  mariadb_data:
+    driver: local
+  drupal_data:
+    driver: local
--- a/bitnami/drupal/8/ol-7/rootfs/apache-inputs.json
+++ b/bitnami/drupal/8/ol-7/rootfs/apache-inputs.json
@@ -0,0 +1,4 @@
+{
+  "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}",
+  "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}"
+}
--- a/bitnami/drupal/8/ol-7/rootfs/app-entrypoint.sh
+++ b/bitnami/drupal/8/ol-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" == "./run.sh" ]]; then
+  . /init.sh
+  nami_initialize apache php mysql-client drupal
+  info "Starting drupal... "
+fi
+
+exec tini -- "$@"
--- a/bitnami/drupal/8/ol-7/rootfs/drupal-inputs.json
+++ b/bitnami/drupal/8/ol-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}}"
+}
--- a/bitnami/drupal/8/ol-7/rootfs/init.sh
+++ b/bitnami/drupal/8/ol-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
--- a/bitnami/drupal/8/ol-7/rootfs/mysql-client-inputs.json
+++ b/bitnami/drupal/8/ol-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}}"
+}
--- a/bitnami/drupal/8/ol-7/rootfs/run.sh
+++ b/bitnami/drupal/8/ol-7/rootfs/run.sh
@@ -0,0 +1,17 @@
+#!/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"
+
+# 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
+
+info "Starting ${DAEMON}..."
+exec ${EXEC} ${ARGS}
--- a/bitnami/drupal/README.md
+++ b/bitnami/drupal/README.md
@@ -25,8 +25,9 @@ $ docker-compose up -d

 # 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)
+* [`8-ol-7`, `8.5.3-ol-7-r0` (8/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.3-ol-7-r0/8/ol-7/Dockerfile)
 * [`8-rhel-7`, `8.5.3-rhel-7-r1` (8/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.3-rhel-7-r1/8/rhel-7/Dockerfile)
+* [`8`, `8.5.3-r26`, `latest` (8/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.3-r26/8/Dockerfile)
 * [`8-php5-rhel-7`, `8.5.3-php5-rhel-7-r0` (8-php5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-drupal/blob/8.5.3-php5-rhel-7-r0/8-php5/rhel-7/Dockerfile)

 Subscribe to project updates by watching the [bitnami/drupal GitHub repo](https://github.com/bitnami/bitnami-docker-drupal).
--- a/bitnami/drupal/circle.yml
+++ b/bitnami/drupal/circle.yml
@@ -8,7 +8,7 @@ jobs:
          RELEASE_SERIES_LIST: "8,8-php5"
          LATEST_STABLE: "8"
          VARIANTS_LIST: "php5"
-          DISTRIBUTIONS_LIST: "debian-8,rhel-7"
+          DISTRIBUTIONS_LIST: "debian-8,ol-7,rhel-7"
          IMAGE_NAME: drupal
          CHART_NAME: drupal
          CHART_REPO: https://github.com/kubernetes/charts