diff --git a/Jenkinsfile b/Jenkinsfile index 9a193f6..8d9722d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,7 +72,9 @@ pipeline { fi done fi - docker system prune -f --volumes || : ''' + docker system prune -f --volumes || : + docker image prune -af || : + ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -754,7 +756,8 @@ pipeline { if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : + docker image prune -af || : ''' } } @@ -1180,6 +1183,7 @@ EOF done fi docker system prune -f --volumes || : + docker image prune -af || : ''' cleanWs() } diff --git a/README.md b/README.md index 5881099..97273e4 100644 --- a/README.md +++ b/README.md @@ -340,6 +340,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.02.25:** - Add support for sshd_config.d * **12.01.25:** - Rebase to Alpine 3.21. * **24.11.24:** - Move sshd_config to /config/sshd/sshd_config. * **31.05.24:** - Rebase to Alpine 3.20. diff --git a/readme-vars.yml b/readme-vars.yml index 4e8dbeb..475a552 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -121,6 +121,7 @@ init_diagram: | # changelog changelogs: - {date: "12.02.25:", desc: "Add support for trusted user CA keys"} + - {date: "10.02.25:", desc: "Add support for sshd_config.d"} - {date: "12.01.25:", desc: "Rebase to Alpine 3.21."} - {date: "24.11.24:", desc: "Move sshd_config to /config/sshd/sshd_config."} - {date: "31.05.24:", desc: "Rebase to Alpine 3.20."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run b/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run index 076bead..d883ec9 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run @@ -51,6 +51,12 @@ if [[ ! -d /config/ssh_host_keys ]]; then cp /etc/ssh/ssh_host_* /config/ssh_host_keys fi +# Enable sshd_config.d if mounted +if [[ -d /config/sshd/sshd_config.d ]]; then + sed -i 's/Include \/etc\/ssh\/sshd_config.d\/\*.conf/Include \/config\/sshd\/sshd_config.d\/\*.conf/' /config/sshd/sshd_config + sed -i '/Include \/config\/sshd\/sshd_config.d/s/^#*//' /config/sshd/sshd_config +fi + # display SSH host public key(s) echo "SSH host public key(s):" cat /config/ssh_host_keys/ssh_host_*.pub