4.9.6-ol-7-r0 release

Add new parameters to handle HTTP ports to WP module
2026-02-25 15:47:42 +08:00 · 2018-05-28 17:58:35 +00:00
parent aa7cfcdb70
commit 142f9cb1b5
9 changed files with 163 additions and 1 deletions
--- a/bitnami/wordpress/4/ol-7/Dockerfile
+++ b/bitnami/wordpress/4/ol-7/Dockerfile
@@ -0,0 +1,50 @@
+FROM bitnami/oraclelinux-extras:7-r2
+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.0.30-3 --checksum 1de72790ae78f941b400212bba9f04201373b7573e679818a7f06edbb65cf473
+RUN bitnami-pkg unpack mysql-client-10.1.33-0 --checksum 250e5cd0f6f256fb39e8d8b703856dbc0257f3da9659b8565398173a3119dd9c
+RUN bitnami-pkg install libphp-7.0.30-5 --checksum c48653df50b0d51d25a2258ae45af9467c370dcda25300b4c861de5b3e6a71e1
+RUN bitnami-pkg unpack wordpress-4.9.6-1 --checksum 15b3fbe5171f6f696d4b5b2600b733e166929a6f7ec6387e6123114ac0ac9cd1
+
+COPY rootfs /
+ENV ALLOW_EMPTY_PASSWORD="no" \
+    APACHE_HTTPS_PORT_NUMBER="443" \
+    APACHE_HTTP_PORT_NUMBER="80" \
+    BITNAMI_APP_NAME="wordpress" \
+    BITNAMI_IMAGE_VERSION="4.9.6-ol-7-r0" \
+    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:$PATH" \
+    SMTP_HOST="" \
+    SMTP_PASSWORD="" \
+    SMTP_PORT="" \
+    SMTP_PROTOCOL="" \
+    SMTP_USER="" \
+    SMTP_USERNAME="" \
+    WORDPRESS_BLOG_NAME="User's Blog!" \
+    WORDPRESS_DATABASE_NAME="bitnami_wordpress" \
+    WORDPRESS_DATABASE_PASSWORD="" \
+    WORDPRESS_DATABASE_USER="bn_wordpress" \
+    WORDPRESS_EMAIL="user@example.com" \
+    WORDPRESS_FIRST_NAME="FirstName" \
+    WORDPRESS_HOST="" \
+    WORDPRESS_HTTPS_PORT="443" \
+    WORDPRESS_HTTP_PORT="80" \
+    WORDPRESS_LAST_NAME="LastName" \
+    WORDPRESS_PASSWORD="bitnami" \
+    WORDPRESS_TABLE_PREFIX="wp_" \
+    WORDPRESS_USERNAME="user"
+
+EXPOSE 80 443
+
+ENTRYPOINT ["/app-entrypoint.sh"]
+CMD ["nami","start","--foreground","apache"]
--- a/bitnami/wordpress/4/ol-7/docker-compose.yml
+++ b/bitnami/wordpress/4/ol-7/docker-compose.yml
@@ -0,0 +1,30 @@
+version: '2'
+services:
+  mariadb:
+    image: 'bitnami/mariadb:latest'
+    volumes:
+      - 'mariadb_data:/bitnami'
+    environment:
+      - MARIADB_USER=bn_wordpress
+      - MARIADB_DATABASE=bitnami_wordpress
+      - ALLOW_EMPTY_PASSWORD=yes
+  wordpress:
+    image: 'bitnami/wordpress:4-ol-7'
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes:
+      - 'wordpress_data:/bitnami'
+    depends_on:
+      - mariadb
+    environment:
+      - MARIADB_HOST=mariadb
+      - MARIADB_PORT_NUMBER=3306
+      - WORDPRESS_DATABASE_USER=bn_wordpress
+      - WORDPRESS_DATABASE_NAME=bitnami_wordpress
+      - ALLOW_EMPTY_PASSWORD=yes
+volumes:
+  mariadb_data:
+    driver: local
+  wordpress_data:
+    driver: local
--- a/bitnami/wordpress/4/ol-7/rootfs/apache-inputs.json
+++ b/bitnami/wordpress/4/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/wordpress/4/ol-7/rootfs/app-entrypoint.sh
+++ b/bitnami/wordpress/4/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" == "/init.sh" ]]; then
+  . /init.sh
+  nami_initialize apache php mysql-client wordpress
+  info "Starting wordpress... "
+fi
+
+exec tini -- "$@"
--- a/bitnami/wordpress/4/ol-7/rootfs/init.sh
+++ b/bitnami/wordpress/4/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/wordpress/4/ol-7/rootfs/mysql-client-inputs.json
+++ b/bitnami/wordpress/4/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/wordpress/4/ol-7/rootfs/wordpress-inputs.json
+++ b/bitnami/wordpress/4/ol-7/rootfs/wordpress-inputs.json
@@ -0,0 +1,23 @@
+{
+  "blogName": "{{$global.env.WORDPRESS_BLOG_NAME}}",
+  "databaseName": "{{$global.env.WORDPRESS_DATABASE_NAME}}",
+  "databasePassword": "{{$global.env.WORDPRESS_DATABASE_PASSWORD}}",
+  "databaseServerHost": "{{$global.env.MARIADB_HOST}}",
+  "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}",
+  "databaseUser": "{{$global.env.WORDPRESS_DATABASE_USER}}",
+  "email": "{{$global.env.WORDPRESS_EMAIL}}",
+  "firstName": "{{$global.env.WORDPRESS_FIRST_NAME}}",
+  "host": "{{$global.env.WORDPRESS_HOST}}",
+  "httpPort": "{{$global.env.WORDPRESS_HTTP_PORT}}",
+  "httpsPort": "{{$global.env.WORDPRESS_HTTPS_PORT}}",
+  "lastName": "{{$global.env.WORDPRESS_LAST_NAME}}",
+  "password": "{{$global.env.WORDPRESS_PASSWORD}}",
+  "smtpHost": "{{$global.env.SMTP_HOST}}",
+  "smtpPassword": "{{$global.env.SMTP_PASSWORD}}",
+  "smtpPort": "{{$global.env.SMTP_PORT}}",
+  "smtpProtocol": "{{$global.env.SMTP_PROTOCOL}}",
+  "smtpUser": "{{$global.env.SMTP_USER}}",
+  "smtpUsername": "{{$global.env.SMTP_USERNAME}}",
+  "tablePrefix": "{{$global.env.WORDPRESS_TABLE_PREFIX}}",
+  "username": "{{$global.env.WORDPRESS_USERNAME}}"
+}
--- a/bitnami/wordpress/README.md
+++ b/bitnami/wordpress/README.md
@@ -26,6 +26,7 @@ $ docker-compose up
 # Supported tags and respective `Dockerfile` links

 * [`4`, `4.9.6-r5`, `latest` (4/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.6-r5/4/Dockerfile)
+* [`4-ol-7`, `4.9.6-ol-7-r0` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.6-ol-7-r0/4/ol-7/Dockerfile)
 * [`4-rhel-7`, `4.9.6-rhel-7-r2` (4/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.6-rhel-7-r2/4/rhel-7/Dockerfile)
 * [`4-php5-rhel-7`, `4.9.6-php5-rhel-7-r1` (4-php5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.6-php5-rhel-7-r1/4-php5/rhel-7/Dockerfile)

--- a/bitnami/wordpress/circle.yml
+++ b/bitnami/wordpress/circle.yml
@@ -8,7 +8,7 @@ jobs:
          RELEASE_SERIES_LIST: "4,4-php5"
          LATEST_STABLE: "4"
          VARIANTS_LIST: "php5"
-          DISTRIBUTIONS_LIST: "debian-8,rhel-7"
+          DISTRIBUTIONS_LIST: "debian-8,ol-7,rhel-7"
          IMAGE_NAME: wordpress
          CHART_NAME: wordpress
          CHART_REPO: https://github.com/kubernetes/charts