Merge branch 'centos-7-develop' into issue/695

.env.example

@@ -1,13 +1,12 @@
 ENABLE_REAPER=false
+ENABLE_SSHD_BOOTSTRAP=true
+ENABLE_SSHD_WRAPPER=true
 REAPER_TIMEOUT=0
 SSH_AUTHORIZED_KEYS=
-SSH_AUTOSTART_SSHD=true
-SSH_AUTOSTART_SSHD_BOOTSTRAP=true
 SSH_CHROOT_DIRECTORY=%h
 SSH_INHERIT_ENVIRONMENT=false
 SSH_PASSWORD_AUTHENTICATION=false
 SSH_SUDO=ALL=(ALL) ALL
-SSH_TIMEZONE=UTC
 SSH_USER=app-admin
 SSH_USER_FORCE_SFTP=false
 SSH_USER_HOME=/home/%u
@@ -16,3 +15,4 @@ SSH_USER_PASSWORD=
 SSH_USER_PASSWORD_HASHED=false
 SSH_USER_PRIVATE_KEY=
 SSH_USER_SHELL=/bin/bash
+SYSTEM_TIMEZONE=UTC

CHANGELOG.md

@@ -6,15 +6,25 @@ Summary of release changes for Version 2 - CentOS-7
 
 ### 2.6.0 - Unreleased
 
+- Deprecates `SSH_AUTOSTART_SSHD`, replaced with `ENABLE_SSHD_WRAPPER`.
+- Deprecates `SSH_AUTOSTART_SSHD_BOOTSTRAP`, replaced with `ENABLE_SSHD_BOOTSTRAP`.
+- Deprecates `SSH_AUTOSTART_SUPERVISOR_STDOUT`, replaced with `ENABLE_SUPERVISOR_STDOUT`.
+- Deprecates `SSH_TIMEZONE`, replaced with `SYSTEM_TIMEZONE`.
 - Updates source tag to CentOS 7.6.1810.
 - Updates supervisord to 4.0.3.
-- Updates default value of `SSH_AUTOSTART_SUPERVISOR_STDOUT` to false.
+- Updates default value of `ENABLE_SUPERVISOR_STDOUT` to false.
 - Updates `sshd-bootstrap` and `sshd-wrapper` configuration to send error log output to stderr.
 - Updates order of values in SSH/SFTP Details log output.
+- Updates bootstrap timer to use UTC date timestamps.
+- Updates bootstrap supervisord configuration file/priority to `20-sshd-bootstrap.conf`/`20`.
+- Updates wrapper supervisord configuration file/priority to `50-sshd-wrapper.conf`/`50`.
 - Adds reference to `python-setuptools` in README; removed in error.
 - Adds `inspect`, `reload` and `top` Makefile targets.
 - Adds improved lock/state file implementation in bootstrap and wrapper scripts.
 - Adds improved `clean` Makefile target; includes exited containers and dangling images.
+- Adds improved wait on bootstrap completion in wrapper script.
+- Adds `system-timezone` and `system-timezone-wrapper` to handle system time zone setup.
+- Adds system time zone validation to healthcheck.
 - Adds feature to optionally exit the container after a specified timout period.
 - Adds `ENABLE_REAPER` with a default value of `false` to enable the `reaper` service.
 - Adds `REAPER_TIMEOUT` with a default value of `0` seconds (i.e no timeout delay).
@@ -23,7 +33,10 @@ Summary of release changes for Version 2 - CentOS-7
 - Fixes binary paths in systemd unit files for compatibility with both EL and Ubuntu hosts.
 - Fixes use of printf binary instead of builtin in systemd unit files.
 - Fixes docker host connection status check in Makefile.
+- Fixes make clean error thrown when removing exited containers.
 - Removes support for long image tags (i.e. centos-7-2.x.x).
+- Removes system time zone setup from `sshd-bootstrap`.
+- Removes redundant directory test from `sshd-bootstrap`; state file ensures it's a one-shot process.
 
 ### 2.5.1 - 2019-02-28
 

Dockerfile

@@ -23,6 +23,10 @@ RUN rpm --rebuilddb \
 		centos-release-scl-rh \
 		epel-release \
 		https://centos7.iuscommunity.org/ius-release.rpm \
+	&& yum -y install \
+			--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 \
@@ -31,6 +35,7 @@ RUN rpm --rebuilddb \
 		sysvinit-tools-2.88-14.dsf.el7 \
 		yum-plugin-versionlock-1.1.31-50.el7 \
 	&& yum versionlock add \
+		inotify-tools \
 		openssh \
 		openssh-server \
 		openssh-clients \
@@ -83,9 +88,9 @@ RUN ln -sf \
 		-e "s~{{RELEASE_VERSION}}~${RELEASE_VERSION}~g" \
 		/etc/systemd/system/[email protected] \
 	&& chmod 644 \
-		/etc/{supervisord.conf,supervisord.d/sshd-{bootstrap,wrapper}.conf} \
+		/etc/{supervisord.conf,supervisord.d/{20-sshd-bootstrap,50-sshd-wrapper}.conf} \
 	&& chmod 700 \
-		/usr/{bin/healthcheck,sbin/{reaper,scmi,sshd-{bootstrap,wrapper}}}
+		/usr/{bin/healthcheck,sbin/{reaper,scmi,sshd-{bootstrap,wrapper},system-{timezone,timezone-wrapper}}}
 
 EXPOSE 22
 
@@ -94,24 +99,24 @@ EXPOSE 22
 # ------------------------------------------------------------------------------
 ENV \
 	ENABLE_REAPER="false" \
+	ENABLE_SSHD_BOOTSTRAP="true" \
+	ENABLE_SSHD_WRAPPER="true" \
+	ENABLE_SUPERVISOR_STDOUT="false" \
 	REAPER_TIMEOUT="0" \
 	SSH_AUTHORIZED_KEYS="" \
-	SSH_AUTOSTART_SSHD="true" \
-	SSH_AUTOSTART_SSHD_BOOTSTRAP="true" \
-	SSH_AUTOSTART_SUPERVISOR_STDOUT="false" \
 	SSH_CHROOT_DIRECTORY="%h" \
 	SSH_INHERIT_ENVIRONMENT="false" \
 	SSH_PASSWORD_AUTHENTICATION="false" \
 	SSH_SUDO="ALL=(ALL) ALL" \
-	SSH_TIMEZONE="UTC" \
 	SSH_USER="app-admin" \
 	SSH_USER_FORCE_SFTP="false" \
 	SSH_USER_HOME="/home/%u" \
 	SSH_USER_ID="500:500" \
 	SSH_USER_PASSWORD="" \
 	SSH_USER_PASSWORD_HASHED="false" \
 	SSH_USER_PRIVATE_KEY="" \
-	SSH_USER_SHELL="/bin/bash"
+	SSH_USER_SHELL="/bin/bash" \
+	SYSTEM_TIMEZONE="UTC"
 
 # ------------------------------------------------------------------------------
 # Set image metadata

Makefile

@@ -745,9 +745,9 @@ rm-exited: \
 			"$(PREFIX_STEP)" \
 			"Removing exited containers"; \
 		$(docker) rm -f \
-			"$$($(docker) ps -aq \
+			$$($(docker) ps -aq \
 				--filter "status=exited" \
-			)" \
+			) \
 			1> /dev/null; \
 	fi
 

README.md

@@ -16,7 +16,7 @@ The latest CentOS-6 / CentOS-7 based releases can be pulled from the `centos-6`
 
 The Dockerfile can be used to build a base image that is the bases for several other docker images.
 
-Included in the build are the [SCL](https://www.softwarecollections.org/), [EPEL](http://fedoraproject.org/wiki/EPEL) and [IUS](https://ius.io) repositories. Installed packages include [OpenSSH](http://www.openssh.com/portable.html) secure shell, [Sudo](http://www.courtesan.com/sudo/) and [vim-minimal](http://www.vim.org/) are along with python-setuptools, [supervisor](http://supervisord.org/) and [supervisor-stdout](https://github.com/coderanger/supervisor-stdout).
+Included in the build are the [SCL](https://www.softwarecollections.org/), [EPEL](http://fedoraproject.org/wiki/EPEL) and [IUS](https://ius.io) repositories. Installed packages include [inotify-tools](https://github.com/rvoicilas/inotify-tools/wiki), [OpenSSH](http://www.openssh.com/portable.html) secure shell, [Sudo](http://www.courtesan.com/sudo/), [vim-minimal](http://www.vim.org/), python-setuptools, [supervisor](http://supervisord.org/) and [supervisor-stdout](https://github.com/coderanger/supervisor-stdout).
 
 [Supervisor](http://supervisord.org/) is used to start and the sshd daemon when a docker container based on this image is run.
 
@@ -254,14 +254,28 @@ $ docker logs ssh.1
 The output of the logs will show the auto-generated password for the user specified by `SSH_USER` on first run.
 
 ```
-2019-06-09 10:20:09,504 WARN No file matches via include "/etc/supervisord.d/*.ini"
-2019-06-09 10:20:09,504 INFO Included extra file "/etc/supervisord.d/00-supervisor_stdout.conf" during parsing
-2019-06-09 10:20:09,504 INFO Included extra file "/etc/supervisord.d/sshd-bootstrap.conf" during parsing
-2019-06-09 10:20:09,504 INFO Included extra file "/etc/supervisord.d/sshd-wrapper.conf" during parsing
-2019-06-09 10:20:09,504 INFO Set uid to user 0 succeeded
-2019-06-09 10:20:09,506 INFO supervisord started with pid 1
-2019-06-09 10:20:10,510 INFO spawned: 'sshd-bootstrap' with pid 9
-2019-06-09 10:20:10,513 INFO spawned: 'sshd-wrapper' with pid 10
+2019-06-20 00:10:35,306 WARN No file matches via include "/etc/supervisord.d/*.ini"
+2019-06-20 00:10:35,306 INFO Included extra file "/etc/supervisord.d/00-supervisor_stdout.conf" during parsing
+2019-06-20 00:10:35,307 INFO Included extra file "/etc/supervisord.d/10-system-timezone-wrapper.conf" during parsing
+2019-06-20 00:10:35,307 INFO Included extra file "/etc/supervisord.d/20-sshd-bootstrap.conf" during parsing
+2019-06-20 00:10:35,307 INFO Included extra file "/etc/supervisord.d/50-sshd-wrapper.conf" during parsing
+2019-06-20 00:10:35,307 INFO Set uid to user 0 succeeded
+2019-06-20 00:10:35,310 INFO supervisord started with pid 1
+2019-06-20 00:10:36,315 INFO spawned: 'system-timezone-wrapper' with pid 9
+2019-06-20 00:10:36,318 INFO spawned: 'sshd-bootstrap' with pid 10
+2019-06-20 00:10:36,320 INFO spawned: 'sshd-wrapper' with pid 11
+INFO: sshd-wrapper waiting on sshd-bootstrap
+2019-06-20 00:10:36,328 INFO success: system-timezone-wrapper entered RUNNING state, process has stayed up for > than 0 seconds (startsecs)
+2019-06-20 00:10:36,328 INFO success: sshd-bootstrap entered RUNNING state, process has stayed up for > than 0 seconds (startsecs)
+
+================================================================================
+System Time Zone Details
+--------------------------------------------------------------------------------
+timezone : UTC
+--------------------------------------------------------------------------------
+0.00640178
+
+2019-06-20 00:10:36,346 INFO exited: system-timezone-wrapper (exit status 0; expected)
 
 ================================================================================
 SSH Details
@@ -271,31 +285,44 @@ home : /home/app-admin
 id : 500:500
 key fingerprints :
 dd:3b:b8:2e:85:04:06:e9:ab:ff:a8:0a:c0:04:6e:d6 (insecure key)
-password : buSoRzQB3dyXw67L
+password : uIEqLkiacCvxaN45
 password authentication : no
 rsa private key fingerprint :
 N/A
 rsa host key fingerprint :
-5d:29:c0:f0:ee:4b:6a:d5:fe:76:a4:1d:1e:c4:e8:4d
+7d:6f:d2:e8:7e:84:dd:ff:98:05:5e:6f:35:66:51:53
 shell : /bin/bash
 sudo : ALL=(ALL) ALL
-timezone : UTC
 user : app-admin
 --------------------------------------------------------------------------------
-0.355662
+0.516901
 
-2019-06-09 10:20:10,880 INFO success: sshd-bootstrap entered RUNNING state, process has stayed up for > than 0 seconds (startsecs)
-2019-06-09 10:20:10,880 INFO success: sshd-wrapper entered RUNNING state, process has stayed up for > than 0 seconds (startsecs)
-2019-06-09 10:20:10,883 INFO exited: sshd-bootstrap (exit status 0; expected)
 INFO: sshd-wrapper starting sshd
+2019-06-20 00:10:36,852 INFO exited: sshd-bootstrap (exit status 0; expected)
 Server listening on 0.0.0.0 port 22.
 Server listening on :: port 22.
+2019-06-20 00:10:41,872 INFO success: sshd-wrapper entered RUNNING state, process has stayed up for > than 5 seconds (startsecs)
 ```
 
 #### Environment Variables
 
 There are several environmental variables defined at runtime these allow the operator to customise the running container.
 
+##### ENABLE_SSHD_BOOTSTRAP & ENABLE_SSHD_WRAPPER
+
+It may be desirable to prevent the startup of the sshd-bootstrap script and/or sshd daemon. For example, when using an image built from this Dockerfile as the source for another Dockerfile you could disable both sshd-booststrap and sshd from startup by setting `ENABLE_SSHD_BOOTSTRAP` and `ENABLE_SSHD_WRAPPER` to `false`. The benefit of this is to reduce the number of running processes in the final container.
+
+```
+...
+  --env "ENABLE_SSHD_BOOTSTRAP=false" \
+  --env "ENABLE_SSHD_WRAPPER=false" \
+...
+```
+
+##### ENABLE_SUPERVISOR_STDOUT
+
+This image has `supervisor_stdout` installed which can be used to allow a process controlled by supervisord to send output to both a log file and stdout. It is recommended to simply output to stdout in order to reduce the number of running processes to a minimum. Setting `ENABLE_SUPERVISOR_STDOUT` to "false" will prevent the startup of `supervisor_stdout`. Where an image requires this feature for its logging output `ENABLE_SUPERVISOR_STDOUT` should be set to "true".
+
 ##### SSH_AUTHORIZED_KEYS
 
 As detailed below the public key added for the SSH user is insecure by default. This is intentional and allows for access using a known private key. Using `SSH_AUTHORIZED_KEYS` you can replace the insecure public key with another one (or several). Further details on how to create your own private + public key pair are provided below. If adding more than one key it is recommended to either base64 encode the value or use a container file path in combination with a bind mounted file or Docker Swarm config etc.
@@ -327,21 +354,6 @@ Using `SSH_AUTHORIZED_KEYS` with a container file path allows for the authorized
 ...
 ```
 
-##### SSH_AUTOSTART_SSHD & SSH_AUTOSTART_SSHD_BOOTSTRAP
-
-It may be desirable to prevent the startup of the sshd daemon and/or sshd-bootstrap script. For example, when using an image built from this Dockerfile as the source for another Dockerfile you could disable both sshd and sshd-booststrap from startup by setting `SSH_AUTOSTART_SSHD` and `SSH_AUTOSTART_SSHD_BOOTSTRAP` to `false`. The benefit of this is to reduce the number of running processes in the final container.
-
-```
-...
-  --env "SSH_AUTOSTART_SSHD=false" \
-  --env "SSH_AUTOSTART_SSHD_BOOTSTRAP=false" \
-...
-```
-
-##### SSH_AUTOSTART_SUPERVISOR_STDOUT
-
-This image has `supervisor_stdout` installed which can be used to allow a process controlled by supervisord to send output to both a log file and stdout. It is recommended to simply output to stdout in order to reduce the number of running processes to a minimum. Setting `SSH_AUTOSTART_SUPERVISOR_STDOUT` to "false" will prevent the startup of `supervisor_stdout`. Where an image requires this feature for its logging output `SSH_AUTOSTART_SUPERVISOR_STDOUT` should be set to "true".
-
 ##### SSH_CHROOT_DIRECTORY
 
 This option is only applicable when `SSH_USER_FORCE_SFTP` is set to `true`. When using the SFTP option the user is jailed into the ChrootDirectory. The value can contain the placeholders `%h` and `%u` which will be replaced with the values of `SSH_USER_HOME` and `SSH_USER` respectively. The default value of `%h` is the best choice in most cases but the user requires a sub-directory in their HOME directory which they have write access to. If no volume is mounted into the path of the SSH user's HOME directory then a directory named `_data` is created automatically. If you need the user to be able to write to their HOME directory then use an alternative value such as `/chroot/%u` so that the user's HOME path, (relative to the ChrootDirectory), becomes `/chroot/app-admin/home/app-admin` by default.
@@ -382,16 +394,6 @@ On first run the SSH user is created with a the sudo rule `ALL=(ALL)  ALL` which
 ...
 ```
 
-##### SSH_TIMEZONE
-
-If you require a locale based system time zone `SSH_TIMEZONE` can be used when running the container.
-
-```
-...
-  --env "SSH_TIMEZONE=Europe/London" \
-...
-```
-
 ##### SSH_USER
 
 On first run the SSH user is created with the default username of "app-admin". If you require an alternative username `SSH_USER` can be used when running the container.
@@ -475,6 +477,16 @@ If set to a valid container file path the value will be read from the file - thi
 ...
 ```
 
+##### SYSTEM_TIMEZONE
+
+If you require a locale based system time zone `SYSTEM_TIMEZONE` can be used when running the container.
+
+```
+...
+  --env "SYSTEM_TIMEZONE=Europe/London" \
+...
+```
+
 ###### Generating a crypt SHA-512 password hash
 
 To generate a hashed password string for the password `Passw0rd!`, use the following method.

default.mk

@@ -42,22 +42,22 @@ define DOCKER_CONTAINER_PARAMETERS
 --name $(DOCKER_NAME) \
 --restart $(DOCKER_RESTART_POLICY) \
 --env "ENABLE_REAPER=$(ENABLE_REAPER)" \
+--env "ENABLE_SSHD_BOOTSTRAP=$(ENABLE_SSHD_BOOTSTRAP)" \
+--env "ENABLE_SSHD_WRAPPER=$(ENABLE_SSHD_WRAPPER)" \
+--env "ENABLE_SUPERVISOR_STDOUT=$(ENABLE_SUPERVISOR_STDOUT)" \
 --env "REAPER_TIMEOUT=$(REAPER_TIMEOUT)" \
 --env "SSH_AUTHORIZED_KEYS=$(SSH_AUTHORIZED_KEYS)" \
---env "SSH_AUTOSTART_SSHD=$(SSH_AUTOSTART_SSHD)" \
---env "SSH_AUTOSTART_SSHD_BOOTSTRAP=$(SSH_AUTOSTART_SSHD_BOOTSTRAP)" \
---env "SSH_AUTOSTART_SUPERVISOR_STDOUT=$(SSH_AUTOSTART_SUPERVISOR_STDOUT)" \
 --env "SSH_CHROOT_DIRECTORY=$(SSH_CHROOT_DIRECTORY)" \
 --env "SSH_INHERIT_ENVIRONMENT=$(SSH_INHERIT_ENVIRONMENT)" \
 --env "SSH_PASSWORD_AUTHENTICATION=$(SSH_PASSWORD_AUTHENTICATION)" \
 --env "SSH_SUDO=$(SSH_SUDO)" \
---env "SSH_TIMEZONE=$(SSH_TIMEZONE)" \
 --env "SSH_USER=$(SSH_USER)" \
 --env "SSH_USER_FORCE_SFTP=$(SSH_USER_FORCE_SFTP)" \
 --env "SSH_USER_HOME=$(SSH_USER_HOME)" \
 --env "SSH_USER_ID=$(SSH_USER_ID)" \
 --env "SSH_USER_PASSWORD=$(SSH_USER_PASSWORD)" \
 --env "SSH_USER_PASSWORD_HASHED=$(SSH_USER_PASSWORD_HASHED)" \
 --env "SSH_USER_PRIVATE_KEY=$(SSH_USER_PRIVATE_KEY)" \
---env "SSH_USER_SHELL=$(SSH_USER_SHELL)"
+--env "SSH_USER_SHELL=$(SSH_USER_SHELL)" \
+--env "SYSTEM_TIMEZONE=$(SYSTEM_TIMEZONE)"
 endef

docker-compose.yml

@@ -29,15 +29,14 @@ services:
       dockerfile: "Dockerfile"
     environment:
       ENABLE_REAPER: "${ENABLE_REAPER}"
+      ENABLE_SSHD_BOOTSTRAP: "${ENABLE_SSHD_BOOTSTRAP}"
+      ENABLE_SSHD_WRAPPER: "${ENABLE_SSHD_WRAPPER}"
       REAPER_TIMEOUT: "${REAPER_TIMEOUT}"
       SSH_AUTHORIZED_KEYS: "${SSH_AUTHORIZED_KEYS}"
-      SSH_AUTOSTART_SSHD: "${SSH_AUTOSTART_SSHD}"
-      SSH_AUTOSTART_SSHD_BOOTSTRAP: "${SSH_AUTOSTART_SSHD_BOOTSTRAP}"
       SSH_CHROOT_DIRECTORY: "${SSH_CHROOT_DIRECTORY}"
       SSH_INHERIT_ENVIRONMENT: "${SSH_INHERIT_ENVIRONMENT}"
       SSH_PASSWORD_AUTHENTICATION: "${SSH_PASSWORD_AUTHENTICATION}"
       SSH_SUDO: "${SSH_SUDO}"
-      SSH_TIMEZONE: "${SSH_TIMEZONE}"
       SSH_USER: "${SSH_USER}"
       SSH_USER_FORCE_SFTP: "${SSH_USER_FORCE_SFTP}"
       SSH_USER_HOME: "${SSH_USER_HOME}"
@@ -46,6 +45,7 @@ services:
       SSH_USER_PASSWORD_HASHED: "${SSH_USER_PASSWORD_HASHED}"
       SSH_USER_PRIVATE_KEY: "${SSH_USER_PRIVATE_KEY}"
       SSH_USER_SHELL: "${SSH_USER_SHELL}"
+      SYSTEM_TIMEZONE: "${SYSTEM_TIMEZONE}"
     image: "jdeathe/centos-ssh:latest"
     ports:
       - "2020:22"

environment.mk

@@ -24,16 +24,15 @@ STARTUP_TIME ?= 2
 # Application container configuration
 # ------------------------------------------------------------------------------
 ENABLE_REAPER ?= false
+ENABLE_SSHD_BOOTSTRAP ?= true
+ENABLE_SSHD_WRAPPER ?= true
+ENABLE_SUPERVISOR_STDOUT ?= false
 REAPER_TIMEOUT ?= 0
 SSH_AUTHORIZED_KEYS ?=
-SSH_AUTOSTART_SSHD ?= true
-SSH_AUTOSTART_SSHD_BOOTSTRAP ?= true
-SSH_AUTOSTART_SUPERVISOR_STDOUT ?= false
 SSH_CHROOT_DIRECTORY ?= %h
 SSH_INHERIT_ENVIRONMENT ?= false
 SSH_PASSWORD_AUTHENTICATION ?= false
 SSH_SUDO ?= ALL=(ALL) ALL
-SSH_TIMEZONE ?= UTC
 SSH_USER ?= app-admin
 SSH_USER_FORCE_SFTP ?= false
 SSH_USER_HOME ?= /home/%u
@@ -42,3 +41,4 @@ SSH_USER_PASSWORD ?=
 SSH_USER_PASSWORD_HASHED ?= false
 SSH_USER_PRIVATE_KEY ?=
 SSH_USER_SHELL ?= /bin/bash
+SYSTEM_TIMEZONE ?= UTC

src/etc/supervisord.conf

@@ -1,4 +1,5 @@
 [supervisord]
+environment = SSH_AUTOSTART_SSHD="%(ENV_ENABLE_SSHD_WRAPPER)s",SSH_AUTOSTART_SSHD_BOOTSTRAP="%(ENV_ENABLE_SSHD_BOOTSTRAP)s",SSH_AUTOSTART_SUPERVISOR_STDOUT="%(ENV_ENABLE_SSHD_BOOTSTRAP)s",SSH_TIMEZONE="%(ENV_SYSTEM_TIMEZONE)s"
 logfile = /dev/null
 logfile_maxbytes = 0
 logfile_backups = 0

src/etc/supervisord.d/00-supervisor_stdout.conf

@@ -1,5 +1,5 @@
 [eventlistener:supervisor_stdout]
-autostart = %(ENV_SSH_AUTOSTART_SUPERVISOR_STDOUT)s
+autostart = %(ENV_ENABLE_SUPERVISOR_STDOUT)s
 buffer_size = 100
 command = /usr/bin/supervisor_stdout
 events = PROCESS_LOG

src/etc/supervisord.d/10-system-timezone-wrapper.conf

@@ -0,0 +1,11 @@
+[program:system-timezone-wrapper]
+autorestart = false
+autostart = true
+command = /usr/sbin/system-timezone-wrapper --verbose
+priority = 10
+startretries = 0
+startsecs = 0
+stderr_logfile = /dev/stderr
+stderr_logfile_maxbytes = 0
+stdout_logfile = /dev/stdout
+stdout_logfile_maxbytes = 0