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

Release changes for 2.3.1

Author: jdeathe

.dockerignore

@@ -1,15 +1,14 @@
-.env
-.env.example
-.git
-.gitignore
-dist
-test
-var
-docker-compose.yml
-docker-compose-*.yml
-LICENSE
-README-short.txt
-*.md
+/.env
+/.env.example
+/.git
+/.gitignore
+/dist
+/docs
+/test
+/docker-compose.yml
+/LICENSE
+/README-short.txt
+/*.md
 !README.md
 **/*.mk
-**/Makefile
+**/Makefile

.gitignore

@@ -1,2 +1,2 @@
-.env
-dist
+/.env
+/dist

CHANGELOG.md

@@ -4,6 +4,23 @@
 
 Summary of release changes.
 
+### 2.3.1 - 2019-10-10
+
+- Deprecate Makefile target `logs-delayed`; replaced with `logsdef`.
+- Updates `rsyslog` package to 8.24.0-41.el7_7.
+- Updates source image to [2.6.1](https://github.com/jdeathe/centos-ssh/releases/tag/2.6.1).
+- Updates `test/health_status` helper script with for consistency.
+- Updates Makefile target `logs` to accept `[OPTIONS]` (e.g `make -- logs -ft`).
+- Updates `healthcheck` script; state file existence confirms bootstrap completion.
+- Updates healthcheck failure messages to remove EOL character that is rendered in status response.
+- Updates wrapper script; only emit "waiting on" info message if bootstrap hasn't completed.
+- Updates ordering of Tags and respective Dockerfile links in README.md for readability.
+- Adds improved test workflow; added `test-setup` target to Makefile.
+- Adds Makefile target `logsdef` to handle deferred logs output within a target chain.
+- Adds `/docs` directory for supplementary documentation and simplify README.
+- Fixes docker-compose example configuration files to work on CentOS-7 hosts.
+- Fixes validation failure of 0 second --timeout value in `test/health_status`.
+
 ### 2.3.0 - 2019-08-20
 
 - Updates `haproxy18u` packages to 1.8.20-1.

Dockerfile

@@ -1,7 +1,7 @@
-FROM jdeathe/centos-ssh:2.6.0
+FROM jdeathe/centos-ssh:2.6.1
 
 ARG HATOP_VERSION="0.7.7"
-ARG RELEASE_VERSION="2.3.0"
+ARG RELEASE_VERSION="2.3.1"
 
 # ------------------------------------------------------------------------------
 # Base install of required packages
@@ -10,7 +10,7 @@ RUN yum -y install \
 			--setopt=tsflags=nodocs \
 			--disableplugin=fastestmirror \
 		haproxy18u-1.8.20-1.el7.ius \
-		rsyslog-8.24.0-34.el7 \
+		rsyslog-8.24.0-41.el7_7 \
 		socat-1.7.3.2-2.el7 \
 	&& yum versionlock add \
 		haproxy \

Makefile

@@ -25,10 +25,11 @@ Targets:
   images                    Show container's image details.
   load                      Loads from the distribution package. Requires
                             DOCKER_IMAGE_TAG variable.
-  logs                      Display log output from the running container.
-  logs-delayed              Display log output from the running container after
-                            backing off for STARTUP_TIME seconds. This can be
-                            necessary when chaining make targets together.
+  logs [OPTIONS]            Display log output from the container.
+  logsdef                   Display log output from the container deferred for
+                            STARTUP_TIME seconds. This will work in a chain
+                            unlike the logs target.
+  logs-delayed              [DEPRECATED] Replaced with logsdef.
   pause                     Pause the running container.
   pull                      Pull the release image from the registry. Requires
                             the DOCKER_IMAGE_TAG variable.
@@ -45,6 +46,7 @@ Targets:
   stop                      Stop the container when in a running state.
   terminate                 Unpause, stop and remove the container.
   test                      Run all test cases.
+  test-setup                Install test dependencies.
   top [ps OPTIONS]          Display the running processes of the container.
   unpause                   Unpause the container when in a paused state.
 
@@ -161,6 +163,7 @@ endef
 	_require-docker-image-tag \
 	_require-docker-release-tag \
 	_require-package-path \
+	_require-root \
 	_test-prerequisites \
 	_usage \
 	all \
@@ -176,6 +179,7 @@ endef
 	images \
 	load \
 	logs \
+	logsdef \
 	logs-delayed \
 	pause \
 	pull \
@@ -191,6 +195,7 @@ endef
 	stop \
 	terminate \
 	test \
+	test-setup \
 	top \
 	unpause
 
@@ -365,9 +370,17 @@ _require-package-path:
 		exit 1; \
 	fi
 
+_require-root:
+	@ if [[ $${EUID} -ne 0 ]]; \
+	then \
+	>&2 printf -- '%sMust be run as root\n' \
+		"$(PREFIX_STEP_NEGATIVE)"; \
+	exit 1; \
+	fi
+
 _test-prerequisites:
 ifeq ($(shpec),)
-	$(error "Please install shpec.")
+	$(error "Please install shpec. Try: DOCKER_NAME=$(DOCKER_NAME) make test-setup")
 endif
 
 _usage:
@@ -581,14 +594,20 @@ install: | \
 logs: \
 	_prerequisites \
 	_require-docker-container
-	@ $(docker) logs $(DOCKER_NAME)
+	@ $(docker) logs \
+		$(filter-out $@, $(MAKECMDGOALS)) \
+		$(DOCKER_NAME)
+%:; @:
 
-logs-delayed: \
+logsdef: \
 	_prerequisites \
 	_require-docker-container
 	@ sleep $(STARTUP_TIME)
 	@ $(MAKE) logs
 
+logs-delayed: \
+	logsdef
+
 load: \
 	_prerequisites \
 	_require-docker-release-tag \
@@ -980,6 +999,18 @@ test: \
 		"Functional test"
 	@ SHPEC_ROOT=$(SHPEC_ROOT) $(shpec)
 
+test-setup: \
+	_require-root
+	@ printf -- '%s%s\n' \
+		"$(PREFIX_STEP)" \
+		"Installing shpec"
+	@ bash -c "$$(curl -LSs \
+			https://raw.githubusercontent.com/rylnd/shpec/master/install.sh \
+		)"
+	@ ln -sf \
+		/usr/local/bin/shpec \
+		/usr/bin/shpec
+
 unpause: \
 	_prerequisites \
 	_require-docker-container \

README.md

@@ -1,7 +1,7 @@
 ### Tags and respective `Dockerfile` links
 
-- `centos-7`, `2.3.0` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-7/Dockerfile)
-- `centos-6`, `1.3.0` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-6/Dockerfile)
+- [`2.3.1`](https://github.com/jdeathe/centos-ssh-haproxy/releases/tag/2.3.1), `centos-7` [(centos-7/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-7/Dockerfile)
+- [`1.3.1`](https://github.com/jdeathe/centos-ssh-haproxy/releases/tag/1.3.1), `centos-6` [(centos-6/Dockerfile)](https://github.com/jdeathe/centos-ssh-haproxy/blob/centos-6/Dockerfile)
 
 ## Overview
 
@@ -29,7 +29,7 @@ $ docker run -d -t \
   -p 443:443 \
   --add-host httpd_1:172.17.8.101 \
   --add-host httpd_2:172.17.8.102 \
-  jdeathe/centos-ssh-haproxy:2.3.0
+  jdeathe/centos-ssh-haproxy:2.3.1
 ```
 
 Verify the named container's process status and health.
@@ -73,7 +73,7 @@ $ docker stop haproxy.1 && \
   --env "HAPROXY_HOST_NAMES=www.app.local app.local localhost.localdomain" \
   --add-host httpd_1:172.17.8.101 \
   --add-host httpd_2:172.17.8.102 \
-  jdeathe/centos-ssh-haproxy:2.3.0
+  jdeathe/centos-ssh-haproxy:2.3.1
 ```
 
 #### Environment variables

docker-compose-h2-proxy.yml

@@ -58,7 +58,7 @@ services:
       VARNISH_VARNISHNCSA_FORMAT: "${VARNISH_VARNISHNCSA_FORMAT}"
       VARNISH_VARNISHNCSA_OPTIONS: "${VARNISH_VARNISHNCSA_OPTIONS}"
       VARNISH_VCL_CONF: "/var/run/secrets/varnish_vcl_terminated_https"
-    image: "jdeathe/centos-ssh-varnish:2.4.0"
+    image: "jdeathe/centos-ssh-varnish:2.5.0"
     networks:
       tier2:
       tier3:
@@ -79,7 +79,7 @@ services:
       nproc: 65535
     volumes:
       # Emulate docker swarm secrets
-      - "./test/fixture/secrets:/var/run/secrets:ro"
+      - "${PWD:-.}/test/fixture/secrets:/var/run/secrets:ro"
   varnish2:
     environment:
       ENABLE_VARNISHNCSA_WRAPPER: "true"
@@ -93,7 +93,7 @@ services:
       VARNISH_VARNISHNCSA_FORMAT: "${VARNISH_VARNISHNCSA_FORMAT}"
       VARNISH_VARNISHNCSA_OPTIONS: "${VARNISH_VARNISHNCSA_OPTIONS}"
       VARNISH_VCL_CONF: "/var/run/secrets/varnish_vcl_terminated_https"
-    image: "jdeathe/centos-ssh-varnish:2.4.0"
+    image: "jdeathe/centos-ssh-varnish:2.4.1"
     networks:
       tier2:
       tier3:
@@ -114,4 +114,4 @@ services:
       nproc: 65535
     volumes:
       # Emulate docker swarm secrets
-      - "./test/fixture/secrets:/var/run/secrets:ro"
+      - "${PWD:-.}/test/fixture/secrets:/var/run/secrets:ro"

docker-compose-http-proxy.yml

@@ -57,8 +57,8 @@ services:
       VARNISH_TTL: "${VARNISH_TTL}"
       VARNISH_VARNISHNCSA_FORMAT: "${VARNISH_VARNISHNCSA_FORMAT}"
       VARNISH_VARNISHNCSA_OPTIONS: "${VARNISH_VARNISHNCSA_OPTIONS}"
-      VARNISH_VCL_CONF: "/run/secrets/varnish_vcl_default"
-    image: "jdeathe/centos-ssh-varnish:2.4.0"
+      VARNISH_VCL_CONF: "/var/run/secrets/varnish_vcl_default"
+    image: "jdeathe/centos-ssh-varnish:2.5.0"
     networks:
       tier2:
       tier3:
@@ -79,7 +79,7 @@ services:
       nproc: 65535
     volumes:
       # Emulate docker swarm secrets
-      - "${PWD}/test/fixture/secrets:/run/secrets:ro"
+      - "${PWD:-.}/test/fixture/secrets:/var/run/secrets:ro"
   varnish2:
     environment:
       ENABLE_VARNISHNCSA_WRAPPER: "true"
@@ -92,8 +92,8 @@ services:
       VARNISH_TTL: "${VARNISH_TTL}"
       VARNISH_VARNISHNCSA_FORMAT: "${VARNISH_VARNISHNCSA_FORMAT}"
       VARNISH_VARNISHNCSA_OPTIONS: "${VARNISH_VARNISHNCSA_OPTIONS}"
-      VARNISH_VCL_CONF: "/run/secrets/varnish_vcl_default"
-    image: "jdeathe/centos-ssh-varnish:2.4.0"
+      VARNISH_VCL_CONF: "/var/run/secrets/varnish_vcl_default"
+    image: "jdeathe/centos-ssh-varnish:2.4.1"
     networks:
       tier2:
       tier3:
@@ -114,4 +114,4 @@ services:
       nproc: 65535
     volumes:
       # Emulate docker swarm secrets
-      - "${PWD}/test/fixture/secrets:/run/secrets:ro"
+      - "${PWD:-.}/test/fixture/secrets:/var/run/secrets:ro"

docker-compose-tcp.yml

@@ -27,11 +27,11 @@ services:
       APACHE_SSL_CERTIFICATE: "${APACHE_SSL_CERTIFICATE}"
     volumes:
       # Emulate docker swarm secrets
-      - "${PWD}/test/fixture/secrets:/var/run/secrets:ro"
+      - "${PWD:-.}/test/fixture/secrets:/var/run/secrets:ro"
   apache-php2:
     environment:
       APACHE_MOD_SSL_ENABLED: "true"
       APACHE_SSL_CERTIFICATE: "${APACHE_SSL_CERTIFICATE}"
     volumes:
       # Emulate docker swarm secrets
-      - "${PWD}/test/fixture/secrets:/var/run/secrets:ro"
+      - "${PWD:-.}/test/fixture/secrets:/var/run/secrets:ro"

docker-compose.yml

@@ -57,7 +57,9 @@ services:
       nproc: 65535
     volumes:
       # Emulate docker swarm secrets
-      - "./test/fixture/secrets:/var/run/secrets:ro"
+      # On CentOS-7 ${PWD} appears to get unset when running docker-compose.
+      # Fail back with the "." value for the working directory.
+      - "${PWD:-.}/test/fixture/secrets:/var/run/secrets:ro"
   apache-php1:
     depends_on:
       - "redis"
@@ -73,7 +75,7 @@ services:
       PHP_OPTIONS_SESSION_SAVE_HANDLER: "redis"
       PHP_OPTIONS_SESSION_SAVE_PATH: "redis:6379"
       SYSTEM_TIMEZONE: "${SYSTEM_TIMEZONE}"
-    image: "jdeathe/centos-ssh-apache-php:3.3.2"
+    image: "jdeathe/centos-ssh-apache-php:3.3.3"
     networks:
       tier3:
         aliases:
@@ -100,7 +102,7 @@ services:
       PHP_OPTIONS_SESSION_SAVE_HANDLER: "redis"
       PHP_OPTIONS_SESSION_SAVE_PATH: "redis:6379"
       SYSTEM_TIMEZONE: "${SYSTEM_TIMEZONE}"
-    image: "jdeathe/centos-ssh-apache-php:3.3.2"
+    image: "jdeathe/centos-ssh-apache-php:3.3.3"
     networks:
       tier3:
         aliases:
@@ -117,7 +119,7 @@ services:
       REDIS_MAXMEMORY: "32mb"
       REDIS_TCP_BACKLOG: "2048"
       SYSTEM_TIMEZONE: "${SYSTEM_TIMEZONE}"
-    image: "jdeathe/centos-ssh-redis:3.1.0"
+    image: "jdeathe/centos-ssh-redis:4.1.1"
     networks:
       - "tier4"
     ports: