Skip to content

Commit

Permalink
add docker secrets to s6-overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
Bram van Dartel committed Apr 14, 2024
1 parent 8bbc391 commit 09e8107
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/run
Original file line number Diff line number Diff line change
Expand Up @@ -334,13 +334,13 @@ function _generate_clientcert_auth_configuration() {

function _docker_secrets {
# shellcheck source=/dev/null
. /etc/s6-overlay/s6-rc.d/docker-entrypoint.d/.env-from-docker-secrets
. /etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/.env-from-docker-secrets

if /usr/bin/find "/etc/s6-overlay/s6-rc.d/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read -r v; then
_info "/etc/s6-overlay/s6-rc.d/docker-entrypoint.d/ is not empty, will attempt to perform configuration"
if /usr/bin/find "/etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read -r v; then
_info "/etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/ is not empty, will attempt to perform configuration"

_info "Looking for shell scripts in /etc/s6-overlay/s6-rc.d/docker-entrypoint.d/"
find "/etc/s6-overlay/s6-rc.d/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
_info "Looking for shell scripts in /etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/"
find "/etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
case "$f" in
*.sh)
if [ -x "$f" ]; then
Expand All @@ -357,7 +357,7 @@ function _docker_secrets {

_info "Docker secrets configuration complete; ready for start up..."
else
_info "No Docker secrets found in /etc/s6-overlay/s6-rc.d/docker-entrypoint.d/, skipping configuration..."
_info "No Docker secrets found in /etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/, skipping configuration..."
fi

}
Expand Down

0 comments on commit 09e8107

Please sign in to comment.