Merge pull request #171 from jdeathe/centos-7-develop

Release changes for 2.1.0

Author: jdeathe

.dockerignore

@@ -1,7 +1,11 @@
+.env
+.env.example
 .git
 .gitignore
 dist
+images
 test
+docker-compose.yml
 LICENSE
 README-short.txt
 *.md

.env.example

@@ -0,0 +1,25 @@
+APACHE_CONTENT_ROOT=/var/www/app
+APACHE_CUSTOM_LOG_FORMAT=combined
+APACHE_CUSTOM_LOG_LOCATION=var/log/apache_access_log
+APACHE_ERROR_LOG_LOCATION=var/log/apache_error_log
+APACHE_ERROR_LOG_LEVEL=warn
+APACHE_EXTENDED_STATUS_ENABLED=false
+APACHE_HEADER_X_SERVICE_UID={{HOSTNAME}}
+APACHE_LOAD_MODULES=
+APACHE_MOD_SSL_ENABLED=false
+APACHE_MPM=worker
+APACHE_OPERATING_MODE=production
+APACHE_PUBLIC_DIRECTORY=public_html
+APACHE_RUN_GROUP=app-www
+APACHE_RUN_USER=app-www
+APACHE_SERVER_ALIAS=
+APACHE_SERVER_NAME=
+APACHE_SSL_CERTIFICATE=
+APACHE_SSL_CIPHER_SUITE=ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
+APACHE_SSL_PROTOCOL=All -SSLv2 -SSLv3
+APACHE_SYSTEM_USER=app
+PACKAGE_PATH=/opt/app
+PHP_OPTIONS_DATE_TIMEZONE=UTC
+PHP_OPTIONS_SESSION_NAME=PHPSESSID
+PHP_OPTIONS_SESSION_SAVE_HANDLER=files
+PHP_OPTIONS_SESSION_SAVE_PATH=var/session

.gitignore

@@ -1,2 +1,3 @@
+.env
 packages
 dist

CHANGELOG.md

@@ -6,6 +6,36 @@ Summary of release changes for Version 2.
 
 CentOS-7 7.5.1804 x86_64, Apache 2.4, PHP-CGI 5.4 (FastCGI), PHP memcached 2.2, Zend Opcache 7.0.
 
+### 2.1.0 - 2019-04-14
+
+- Updates `elinks` package to elinks-0.12-0.37.pre6.el7.0.1.
+- Updates source image to [2.5.1](https://github.com/jdeathe/centos-ssh/releases/tag/2.5.1).
+- Updates and restructures Dockerfile.
+- Updates container naming conventions and readability of `Makefile`.
+- Fixes issue with unexpected published port in run templates when `DOCKER_PORT_MAP_TCP_80`, `DOCKER_PORT_MAP_TCP_443` or `DOCKER_PORT_MAP_TCP_8443` is set to an empty string or 0.
+- Fixes binary paths in systemd unit files for compatibility with both EL and Ubuntu hosts.
+- Fixes link to OpenSSL ciphers manual page.
+- Adds consideration for event lag into test cases for unhealthy health_status events.
+- Adds port incrementation to Makefile's run template for container names with an instance suffix.
+- Adds placeholder replacement of `RELEASE_VERSION` docker argument to systemd service unit template.
+- Adds improvement to pull logic in systemd unit install template.
+- Adds `SSH_AUTOSTART_SUPERVISOR_STDOUT` with a value "false", disabling startup of `supervisor_stdout`.
+- Adds error messages to healthcheck script and includes supervisord check.
+- Adds improved logging output.
+- Adds images directory `.dockerignore` to reduce size of build context.
+- Adds docker-compose configuration example.
+- Adds improved lock/state file implementation between bootstrap and wrapper scripts.
+- Adds graceful stop signals the supervisord configuration for `httpd-wrapper`.
+- Removes use of `/etc/services-config` paths.
+- Removes the unused group element from the default container name.
+- Removes the node element from the default container name.
+- Removes unused environment variables from Makefile and scmi configuration.
+- Removes X-Fleet section from etcd register template unit-file.
+- Removes unnecessary configuration file `/etc/httpd-bootstrap.conf`.
+- Removes systemd health reporting from PHP-FPM configuration.
+- Removes unnecessarily setting random passwords for system accounts during bootstrap; lock instead.
+- Removes requirement for `/usr/sbin/httpd-startup`.
+
 ### 2.0.1 - 2018-12-08
 
 - Updates source image to [2.4.1](https://github.com/jdeathe/centos-ssh/releases/tag/2.4.1).