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

Release changes for 2.6.1

Author: jdeathe

.dockerignore

@@ -1,13 +1,14 @@
-.env
-.env.example
-.git
-.gitignore
-dist
-test
-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

.env.example

@@ -1,5 +1,3 @@
-ENABLE_SSHD_BOOTSTRAP=true
-ENABLE_SSHD_WRAPPER=true
 SSH_AUTHORIZED_KEYS=
 SSH_CHROOT_DIRECTORY=%h
 SSH_INHERIT_ENVIRONMENT=false

.gitignore

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

CHANGELOG.md

@@ -1,8 +1,39 @@
 # Change Log
 
-## centos-7
-
-Summary of release changes for Version 2 - CentOS-7
+## 2 - centos-7
+
+Summary of release changes.
+
+### 2.6.1 - 2019-09-21
+
+- Deprecate Makefile target `logs-delayed`; replaced with `logsdef`.
+- Updates `openssh` package to 7.4p1-21.el7.
+- Updates `openssl` package to 1.0.2k-19.el7.
+- Updates `sudo` package to 1.8.23-4.el7.
+- Updates `yum-plugin-versionlock` package to 1.1.31-52.el7.
+- Updates supervisord to 4.0.4.
+- 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 `system-timezone-wrapper` to improve timer accuracy.
+- Updates scripts to explicitly check for a file when handling lock/state files.
+- Updates method used for returning current script.
+- Updates info/error output for consistency.
+- 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 CHANGELOG.md to simplify maintenance.
+- Updates README.md to simplify contents and improve readability.
+- Updates README-short.txt to apply to all image variants.
+- Updates Dockerfile `org.deathe.description` metadata LABEL for consistency.
+- 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 exec proxy function to `sshd-wrapper` used to pass through nice.
+- Adds double quotes around value containing spaces.
+- Adds `/docs` directory for supplementary documentation and simplify README.
+- Fixes validation failure of 0 second --timeout value in `test/health_status`.
+- Removes `ENABLE_SSHD_BOOTSTRAP` from docker-compose example configuration.
+- Removes `ENABLE_SSHD_WRAPPER` from docker-compose example configuration.
 
 ### 2.6.0 - 2019-06-20
 

Dockerfile

@@ -1,6 +1,6 @@
 FROM centos:7.6.1810
 
-ARG RELEASE_VERSION="2.6.0"
+ARG RELEASE_VERSION="2.6.1"
 
 # ------------------------------------------------------------------------------
 # - Import the RPM GPG keys for repositories
@@ -27,12 +27,12 @@ RUN rpm --rebuilddb \
 			--setopt=tsflags=nodocs \
 			--disableplugin=fastestmirror \
 		inotify-tools-3.14-8.el7 \
-		openssh-clients-7.4p1-16.el7 \
-		openssh-server-7.4p1-16.el7 \
-		openssl-1.0.2k-16.el7 \
+		openssh-clients-7.4p1-21.el7 \
+		openssh-server-7.4p1-21.el7 \
+		openssl-1.0.2k-19.el7 \
 		python-setuptools-0.9.8-7.el7 \
-		sudo-1.8.23-3.el7 \
-		yum-plugin-versionlock-1.1.31-50.el7 \
+		sudo-1.8.23-4.el7 \
+		yum-plugin-versionlock-1.1.31-52.el7 \
 	&& yum versionlock add \
 		inotify-tools \
 		openssh \
@@ -43,7 +43,7 @@ RUN rpm --rebuilddb \
 		yum-plugin-versionlock \
 	&& yum clean all \
 	&& easy_install \
-		'supervisor == 4.0.3' \
+		'supervisor == 4.0.4' \
 		'supervisor-stdout == 0.1.1' \
 	&& mkdir -p \
 		/var/log/supervisor/ \
@@ -145,7 +145,7 @@ jdeathe/centos-ssh:${RELEASE_VERSION} \
 	org.deathe.license="MIT" \
 	org.deathe.vendor="jdeathe" \
 	org.deathe.url="https://github.com/jdeathe/centos-ssh" \
-	org.deathe.description="CentOS-7 7.6.1810 x86_64 - SCL, EPEL and IUS Repositories / Supervisor / OpenSSH."
+	org.deathe.description="OpenSSH 7.4 / Supervisor 4.0 / EPEL/IUS/SCL Repositories - CentOS-7 7.6.1810 x86_64."
 
 HEALTHCHECK \
 	--interval=1s \

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-short.txt

@@ -1 +1 @@
-CentOS-6 6.10 x86_64 / CentOS-7 7.6.1810 x86_64 - SCL/EPEL/IUS Repos / Supervisor / OpenSSH.
+OpenSSH / Supervisor / EPEL/IUS/SCL Repos - CentOS.