4.9.6-rhel-7-r2 release

Undo accidental removal of rhel files
This commit is contained in:
Bitnami Bot 2018-05-25 16:27:18 +00:00
parent 6ecf4ba5c5
commit 9f580224c9
8 changed files with 171 additions and 1 deletions

View File

@ -0,0 +1,57 @@
FROM bitnami/redhat-extras:7-r2
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.0.30-3 --checksum e08b6fc7a366eab9ba73809c7073c9f0495cd51b5a98aa87aee28e99a156168c
RUN bitnami-pkg unpack mysql-client-10.1.33-0 --checksum 4b07acdb7d3f6a61161414ad7f7639da8f291962e242eb257f612d18c8231501
RUN bitnami-pkg install libphp-7.0.30-3 --checksum 6b30a1a49beddad4c8a992976aff809bcbdd2115888530dd3b8257c58844369a
RUN bitnami-pkg unpack wordpress-4.9.6-1 --checksum 2a0125c17f96017e854d46809707df61c47ff30eb0f297e4fdb8f298607a3f4b
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="wordpress" \
BITNAMI_IMAGE_VERSION="4.9.6-rhel-7-r2" \
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="8443" \
WORDPRESS_HTTP_PORT="8080" \
WORDPRESS_LAST_NAME="LastName" \
WORDPRESS_PASSWORD="bitnami" \
WORDPRESS_TABLE_PREFIX="wp_" \
WORDPRESS_USERNAME="user"
EXPOSE 8080 8443
USER 1001
ENTRYPOINT ["/app-entrypoint.sh"]
CMD ["httpd","-f","/bitnami/apache/conf/httpd.conf","-DFOREGROUND"]

View File

@ -0,0 +1,32 @@
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-rhel-7'
ports:
- '80:8080'
- '443:8443'
volumes:
- 'wordpress_data:/bitnami'
depends_on:
- mariadb
environment:
- MARIADB_HOST=mariadb
- MARIADB_PORT_NUMBER=3306
- WORDPRESS_HTTP_PORT=8080
- WORDPRESS_HTTPS_PORT=8443
- WORDPRESS_DATABASE_USER=bn_wordpress
- WORDPRESS_DATABASE_NAME=bitnami_wordpress
- ALLOW_EMPTY_PASSWORD=yes
volumes:
mariadb_data:
driver: local
wordpress_data:
driver: local

View File

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

View File

@ -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 wordpress
info "Starting wordpress... "
fi
exec tini -- "$@"

View File

@ -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

View File

@ -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}}"
}

View File

@ -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}}"
}

View File

@ -26,7 +26,7 @@ $ docker-compose up
# Supported tags and respective `Dockerfile` links
* [`4`, `4.9.6-r4`, `latest` (4/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.6-r4/4/Dockerfile)
* [`4-rhel-7`, `4.9.6-rhel-7-r1` (4/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.6-rhel-7-r1/4/rhel-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-nginx-php5-rhel-7`, `4.9.6-nginx-php5-rhel-7-r0` (4-nginx-php5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.6-nginx-php5-rhel-7-r0/4-nginx-php5/rhel-7/Dockerfile)
* [`4-nginx-php7-rhel-7`, `4.9.6-nginx-php7-rhel-7-r0` (4-nginx-php7/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.6-nginx-php7-rhel-7-r0/4-nginx-php7/rhel-7/Dockerfile)
* [`4-php5-rhel-7`, `4.9.6-php5-rhel-7-r0` (4-php5/rhel-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-wordpress/blob/4.9.6-php5-rhel-7-r0/4-php5/rhel-7/Dockerfile)