Merge branch 'release-5.0.3' into stable

Author: BertrandGouny

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project follows Wordpress versioning.
 
+## [5.0.3] - 2019-01-30
+### Changed
+  - Upgrade Wordpress version to 5.0.3
+
 ## [4.9.7] - 2018-07-28
 ### Changed
   - Upgrade Wordpress version to 4.9.7
@@ -98,6 +102,9 @@ and this project follows Wordpress versioning.
 ## 0.1.0 - 2015-02-23
 Initial release
 
+[5.0.3]: https://github.com/osixia/docker-wordpress/compare/v4.9.7...v5.0.3
+[4.9.7]: https://github.com/osixia/docker-wordpress/compare/v4.9.6...v4.9.7
+[4.9.6]: https://github.com/osixia/docker-wordpress/compare/v4.9.5...v4.9.6
 [4.9.5]: https://github.com/osixia/docker-wordpress/compare/v4.9.4...v4.9.5
 [4.9.4]: https://github.com/osixia/docker-wordpress/compare/v4.9.2...v4.9.4
 [4.9.2]: https://github.com/osixia/docker-wordpress/compare/v4.9.1...v4.9.2

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/wordpress
-VERSION = 4.9.7
+VERSION = 5.0.3
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 

README.md

@@ -6,7 +6,7 @@ A docker image to run wordpress
 
 [hub]: https://hub.docker.com/r/osixia/wordpress/
 
-Latest release: 4.9.7 - Wordpress 4.9.7 -  [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/wordpress) 
+Latest release: 5.0.3 - Wordpress 5.0.3 -  [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/wordpress) 
 
 ### Under the hood: osixia/web-baseimage
 

image/Dockerfile

@@ -1,8 +1,8 @@
 FROM osixia/web-baseimage:1.1.1
 
 # Wordpress version
-ARG WORDPRESS_VERSION=4.9.7
-ARG WORDPRESS_MD5=50efc5822bf550e9a526b9b9f4469b0d
+ARG WORDPRESS_VERSION=5.0.3
+ARG WORDPRESS_MD5=83bec78836aabac08f769d50f1bffe5d
 
 # MariaDB version
 ARG MARIADB_MAJOR=10.3
@@ -12,7 +12,7 @@ ARG MARIADB_MAJOR=10.3
 # php7.0-fpm install will detect apache2 and configure it
 
 # Add MariaDB repository
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \
+RUN apt-key adv --no-tty --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 \
     && echo "deb http://ftp.igh.cnrs.fr/pub/mariadb/repo/$MARIADB_MAJOR/debian stretch main" > /etc/apt/sources.list.d/mariadb.list \
     && { \
 		     echo 'Package: *'; \

image/service/backup/assets/tool/wordpress-backup

@@ -6,29 +6,27 @@ backupFileSuffix="-wordpress.tar.gz"
 backupDbSuffix="-wordpress-db.tar.gz"
 databaseFile="database.sql"
 
-source /container/run/environment.sh
+. /container/run/environment.sh
 
 # delete backups that are over $WORDPRESS_BACKUP_TTL days
-find $backupPath -type f -mtime +$WORDPRESS_BACKUP_TTL -exec rm {} \;
+find "${backupPath}" -type f -mtime +"${WORDPRESS_BACKUP_TTL}" -exec rm {} \;
 
 # date format for the dump file name
 dateFileFormat="+%Y%m%dT%H%M%S"
-backupFilePath="$backupPath/$(date "$dateFileFormat")$backupFileSuffix"
+backupFilePath="${backupPath}/$(date "${dateFileFormat}")${backupFileSuffix}"
 
 # save config and plugins except default ones
-tar -czf $backupFilePath -C / var/www/wordpress
-chmod 600 $backupFilePath
+tar -czf "${backupFilePath}" -C / var/www/wordpress
+chmod 600 "${backupFilePath}"
 
 # backup database
 . /container/service/backup/assets/tool/wordpress-get-db-params
-rm -rf $databaseFile || true
+rm -rf "${databaseFile}" || true
 
-mysqldump -u $databaseUser -p$databasePassword --host $host $database > $databaseFile
+mysqldump -u "${databaseUser}" -p"${databasePassword}" --host "${host}" "${database}" > "${databaseFile}"
 
-backupFilePath="$backupPath/$(date "$dateFileFormat")$backupDbSuffix"
-tar -czf $backupFilePath $databaseFile
-chmod 600 $backupFilePath
+backupFilePath="${backupPath}/$(date "${dateFileFormat}")${backupDbSuffix}"
+tar -czf "${backupFilePath}" "${databaseFile}"
+chmod 600 "${backupFilePath}"
 
-rm -rf $databaseFile
-
-exit 0
+rm -rf "${databaseFile}"

image/service/backup/assets/tool/wordpress-restore

@@ -8,27 +8,25 @@ databaseFile="database.sql"
 
 for file in "$@"
 do
-    echo "Processing file $file"
+    echo "Processing file ${file}"
 
-    if $(echo "$file" | grep -q -e "$backupFileSuffix"); then
+    if echo "${file}" | grep -q -e "${backupFileSuffix}"; then
         echo "Restore wordpress files"
-        tar -xvzf $backupPath/$file -C /
+        tar -xvzf "${backupPath}/${file}" -C /
         echo "done :)"
-    elif $(echo "$file" | grep -q -e "$backupDbSuffix"); then
+    elif echo "${file}" | grep -q -e "${backupDbSuffix}"; then
         echo "Restore wordpress database"
         . /container/service/backup/assets/tool/wordpress-get-db-params
 
-        rm -rf $databaseFile || true
-        tar -xvzf $backupPath/$file
+        rm -rf "${databaseFile}" || true
+        tar -xvzf "${backupPath}/${file}"
 
-        mysql -u $databaseUser -p$databasePassword --host $host $database < $databaseFile
+        mysql -u "${databaseUser}" -p"${databasePassword}" --host "${host}" "${database}" < "${databaseFile}"
 
-        rm -rf $databaseFile
+        rm -rf "${databaseFile}"
 
         echo "done :)"
     else
       echo "Error: Unknown file type"
     fi
 done
-
-exit 0

image/service/backup/startup.sh

@@ -5,20 +5,18 @@
 log-helper level eq trace && set -x
 
 # install image tools
-ln -sf ${CONTAINER_SERVICE_DIR}/backup/assets/tool/* /sbin/
+ln -sf "${CONTAINER_SERVICE_DIR}"/backup/assets/tool/* /sbin/
 
 # add cron jobs
-ln -sf ${CONTAINER_SERVICE_DIR}/backup/assets/cronjobs /etc/cron.d/backup
-chmod 600 ${CONTAINER_SERVICE_DIR}/backup/assets/cronjobs
+ln -sf "${CONTAINER_SERVICE_DIR}/backup/assets/cronjobs" /etc/cron.d/backup
+chmod 600 "${CONTAINER_SERVICE_DIR}/backup/assets/cronjobs"
 
 FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-backup-backup-first-start-done"
 # container first start
 if [ ! -e "$FIRST_START_DONE" ]; then
 
   # adapt cronjobs file
-  sed -i "s|{{ WORDPRESS_BACKUP_CRON_EXP }}|${WORDPRESS_BACKUP_CRON_EXP}|g" ${CONTAINER_SERVICE_DIR}/backup/assets/cronjobs
+  sed -i "s|{{ WORDPRESS_BACKUP_CRON_EXP }}|${WORDPRESS_BACKUP_CRON_EXP}|g" "${CONTAINER_SERVICE_DIR}/backup/assets/cronjobs"
 
-  touch $FIRST_START_DONE
+  touch "${FIRST_START_DONE}"
 fi
-
-exit 0

image/service/ldap-client/startup.sh

@@ -8,31 +8,29 @@ www_data_homedir=$( getent passwd "www-data" | cut -d: -f6 )
 
 FIRST_START_DONE="${CONTAINER_STATE_DIR}/docker-ldap-client-first-start-done"
 # container first start
-if [ ! -e "$FIRST_START_DONE" ]; then
+if [ ! -e "${FIRST_START_DONE}" ]; then
 
   if [ "${WORDPRESS_LDAP_CLIENT_TLS,,}" == "true" ]; then
 
     # generate a certificate and key if files don't exists
     # https://github.com/osixia/docker-light-baseimage/blob/stable/image/service-available/:ssl-tools/assets/tool/ssl-helper
-    ssl-helper ${LDAP_CLIENT_SSL_HELPER_PREFIX} "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_CRT_FILENAME}" "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_KEY_FILENAME}" "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_CA_CRT_FILENAME}"
+    ssl-helper "${LDAP_CLIENT_SSL_HELPER_PREFIX}" "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_CRT_FILENAME}" "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_KEY_FILENAME}" "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_CA_CRT_FILENAME}"
 
     # ldap client config
     sed -i --follow-symlinks "s,TLS_CACERT.*,TLS_CACERT ${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_CA_CRT_FILENAME},g" /etc/ldap/ldap.conf
-    echo "TLS_REQCERT $WORDPRESS_LDAP_CLIENT_TLS_REQCERT" >> /etc/ldap/ldap.conf
-    cp -f /etc/ldap/ldap.conf ${CONTAINER_SERVICE_DIR}/ldap-client/assets/ldap.conf
+    echo "TLS_REQCERT ${WORDPRESS_LDAP_CLIENT_TLS_REQCERT}" >> /etc/ldap/ldap.conf
+    cp -f /etc/ldap/ldap.conf "${CONTAINER_SERVICE_DIR}/ldap-client/assets/ldap.conf"
 
-    [[ -f "$www_data_homedir/.ldaprc" ]] && rm -f $www_data_homedir/.ldaprc
-    echo "TLS_CERT ${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_CRT_FILENAME}" > $www_data_homedir/.ldaprc
-    echo "TLS_KEY ${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_KEY_FILENAME}" >> $www_data_homedir/.ldaprc
-    cp -f $www_data_homedir/.ldaprc ${CONTAINER_SERVICE_DIR}/ldap-client/assets/.ldaprc
+    [[ -f "${www_data_homedir}/.ldaprc" ]] && rm -f "${www_data_homedir}/.ldaprc"
+    echo "TLS_CERT ${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_CRT_FILENAME}" > "${www_data_homedir}/.ldaprc"
+    echo "TLS_KEY ${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/${WORDPRESS_LDAP_CLIENT_TLS_KEY_FILENAME}" >> "${www_data_homedir}/.ldaprc"
+    cp -f "${www_data_homedir}/.ldaprc" "${CONTAINER_SERVICE_DIR}/ldap-client/assets/.ldaprc"
 
-    chown www-data:www-data -R ${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/
+    chown www-data:www-data -R "${CONTAINER_SERVICE_DIR}/ldap-client/assets/certs/"
   fi
 
-  touch $FIRST_START_DONE
+  touch "${FIRST_START_DONE}"
 fi
 
-ln -sf ${CONTAINER_SERVICE_DIR}/ldap-client/assets/.ldaprc $www_data_homedir/.ldaprc
-ln -sf ${CONTAINER_SERVICE_DIR}/ldap-client/assets/ldap.conf /etc/ldap/ldap.conf
-
-exit 0
+ln -sf "${CONTAINER_SERVICE_DIR}/ldap-client/assets/.ldaprc" "${www_data_homedir}/.ldaprc"
+ln -sf "${CONTAINER_SERVICE_DIR}/ldap-client/assets/ldap.conf" /etc/ldap/ldap.conf

image/service/wordpress/startup.sh

@@ -16,20 +16,20 @@ if [ "${WORDPRESS_HTTPS,,}" == "true" ]; then
 
   # generate a certificate and key if files don't exists
   # https://github.com/osixia/docker-light-baseimage/blob/stable/image/service-available/:ssl-tools/assets/tool/ssl-helper
-  ssl-helper ${WORDPRESS_SSL_HELPER_PREFIX} "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/certs/$WORDPRESS_SSL_CRT_FILENAME" "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/certs/$WORDPRESS_SSL_KEY_FILENAME" "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/certs/$WORDPRESS_SSL_CA_CRT_FILENAME"
+  ssl-helper "${WORDPRESS_SSL_HELPER_PREFIX}" "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/certs/$WORDPRESS_SSL_CRT_FILENAME" "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/certs/$WORDPRESS_SSL_KEY_FILENAME" "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/certs/$WORDPRESS_SSL_CA_CRT_FILENAME"
 
   # add CA certificat config if CA cert exists
   if [ -e "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/certs/$WORDPRESS_SSL_CA_CRT_FILENAME" ]; then
-    sed -i "s/#SSLCACertificateFile/SSLCACertificateFile/g" ${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/https.conf
+    sed -i "s/#SSLCACertificateFile/SSLCACertificateFile/g" "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/https.conf"
   fi
 
-  ln -sf ${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/https.conf /etc/apache2/sites-available/wordpress.conf
+  ln -sf "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/https.conf" /etc/apache2/sites-available/wordpress.conf
 #
 # HTTP config
 #
 else
   log-helper info "Set apache2 http config..."
-  ln -sf ${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/http.conf /etc/apache2/sites-available/wordpress.conf
+  ln -sf "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/http.conf" /etc/apache2/sites-available/wordpress.conf
 fi
 
 if [ "${WORDPRESS_DISABLE_XMLRPC,,}" == "true" ]; then
@@ -62,34 +62,34 @@ fi
 rm -rf /var/www/wordpress_bootstrap
 
 # install plugins and themes
-cp --remove-destination -Rf ${CONTAINER_SERVICE_DIR}/wordpress/assets/wp-content/. /var/www/wordpress/wp-content
+cp --remove-destination -Rf "${CONTAINER_SERVICE_DIR}"/wordpress/assets/wp-content/. /var/www/wordpress/wp-content
 
 # if there is no config
 if [ ! -e "/var/www/wordpress/wp-config.php" ] && [ -e "${CONTAINER_SERVICE_DIR}/wordpress/assets/config/wp-config.php" ]; then
 
     log-helper debug "link ${CONTAINER_SERVICE_DIR}/wordpress/assets/config/wp-config.php to /var/www/wordpress/wp-config.php"
-    ln -sf ${CONTAINER_SERVICE_DIR}/wordpress/assets/config/wp-config.php /var/www/wordpress/wp-config.php
+    ln -sf "${CONTAINER_SERVICE_DIR}/wordpress/assets/config/wp-config.php" /var/www/wordpress/wp-config.php
 
 fi
 
 # container first start
 if [ ! -e "$FIRST_START_DONE" ]; then
 
   # Add .htaccess
-  [ -e "/var/www/wordpress/.htaccess" ] || cp -f ${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/.htaccess /var/www/wordpress/.htaccess
+  [ -e "/var/www/wordpress/.htaccess" ] || cp -f "${CONTAINER_SERVICE_DIR}/wordpress/assets/apache2/.htaccess" /var/www/wordpress/.htaccess
 
   # set new install default theme
   if [ -n "$WORDPRESS_DEFAULT_THEME" ]; then
     sed -i "s/define( 'WP_DEFAULT_THEME', '[^']*'/define( 'WP_DEFAULT_THEME', '${WORDPRESS_DEFAULT_THEME}'/g" /var/www/wordpress/wp-includes/default-constants.php
   fi
 
-  cp -f ${CONTAINER_SERVICE_DIR}/wordpress/assets/php7.0-fpm/opcache.ini /etc/php/7.0/fpm/conf.d/opcache.ini
+  cp -f "${CONTAINER_SERVICE_DIR}/wordpress/assets/php7.0-fpm/opcache.ini" /etc/php/7.0/fpm/conf.d/opcache.ini
 
   if [ "${WORDPRESS_PRODUCTION}" = "true" ]; then
     sed -i "s/;opcache.validate_timestamps/opcache.validate_timestamps/g" /etc/php/7.0/fpm/conf.d/opcache.ini
   fi
 
-  touch $FIRST_START_DONE
+  touch "${FIRST_START_DONE}"
 fi
 
 # Fix file permission
@@ -104,5 +104,3 @@ if [ -e "/var/www/wordpress/wp-config.php" ]; then
   chmod 400 /var/www/wordpress/wp-config.php
 
 fi
-
-exit 0