Rename docker-entrypoint to container-entrypoint #59

Sebastian-Maier · 2025-07-30T12:08:00Z

This PR addresses issue #56 by using vendor-agnostic "container" terminology instead of "Docker" (in a backwards-compatible fashion):

introduces container-entrypoint.sh that supports custom scripts in both /docker-custom-entrypoint.d/and /container-custom-entrypoint.d/ directories
adjusts docker-entrypoint.sh to print a deprecation warning and call container-entrypoint.sh
adjusts documentation accordingly

nsballmann · 2025-07-30T12:32:12Z

openvoxserver/docker-entrypoint.sh

-# echo the return code of the application
-exit $return_code
+echoerr "DEPRECATED: Use /container-entrypoint.sh instead of /docker-entrypoint.sh"
+./container-entrypoint.sh "$@"


Suggested change

./container-entrypoint.sh "$@"

exec ./container-entrypoint.sh "$@"

This should avoid a sub-process. But I'm not entirely sure about all the security implications and if the "$@" still is required.

Tested and adjusted as proposed.

nsballmann · 2025-07-30T12:36:48Z

openvoxserver/container-entrypoint.sh

+  run_custom_handler pre-default
+
+  for f in /container-entrypoint.d/*.sh; do


Suggested change

run_custom_handler pre-default

for f in /container-entrypoint.d/*.sh; do

run_custom_handler pre-default

for f in /docker-entrypoint.d/*.sh; do

echoerr "DEPRECATED: Use /container-entrypoint.d/ for $f"

echo "Running $f"

"$f"

done

for f in /container-entrypoint.d/*.sh; do

For additional backwards compatibility.

edit: Forgot that $f is absolut already.

Adjusted this script accordingly: For now we also execute scripts in /docker-entrypoint.d/ but there will be only one deprecation warning when the directory exists.

Ah yeah, true, testing the directory exists is another thing I forgot. That's more defensive. One deprecation warning should be enough.

nsballmann · 2025-07-30T12:45:03Z

openvoxserver/container-entrypoint.d/84-enable_graphite.sh

@@ -5,7 +5,7 @@ set -e
 if [[ "$OPENVOXSERVER_GRAPHITE_EXPORTER_ENABLED" == "true" ]]; then
  if [[ -n "$OPENVOXSERVER_GRAPHITE_HOST" && -n "$OPENVOXSERVER_GRAPHITE_PORT" ]]; then
    echo "Enabling graphite exporter"
-    sed -e "s/GRAPHITE_HOST/$OPENVOXSERVER_GRAPHITE_HOST/" -e "s/GRAPHITE_PORT/$OPENVOXSERVER_GRAPHITE_PORT/" /docker-entrypoint.d/84-metrics.conf.tmpl > /etc/puppetlabs/puppetserver/conf.d/metrics.conf
+    sed -e "s/GRAPHITE_HOST/$OPENVOXSERVER_GRAPHITE_HOST/" -e "s/GRAPHITE_PORT/$OPENVOXSERVER_GRAPHITE_PORT/" /container-entrypoint.d/84-metrics.conf.tmpl > /etc/puppetlabs/puppetserver/conf.d/metrics.conf


Suggested change

sed -e "s/GRAPHITE_HOST/$OPENVOXSERVER_GRAPHITE_HOST/" -e "s/GRAPHITE_PORT/$OPENVOXSERVER_GRAPHITE_PORT/" /container-entrypoint.d/84-metrics.conf.tmpl > /etc/puppetlabs/puppetserver/conf.d/metrics.conf

my_directory="$(dirname "$0")"

sed -e "s/GRAPHITE_HOST/$OPENVOXSERVER_GRAPHITE_HOST/" -e "s/GRAPHITE_PORT/$OPENVOXSERVER_GRAPHITE_PORT/" "${my_directory}/84-metrics.conf.tmpl" > /etc/puppetlabs/puppetserver/conf.d/metrics.conf

This is just a suggestion. It's IMHO a little more elegant way to say "in the same directory like the shell script". It introduces a coreutils dependency because of dirname, though.

Adjusted (in a slightly different manner).

Because of the readlink it now looks for "in the same directory as the file or symlinked-to file" instead of the "in the same directory as the file or the symlink itself". Thinking about this, I looks to me like your proposal is a little cleaner.

Because now one can move the script and the template file into a "library" like location and just symlink the entrypoint script into the entrypoint.d directory.

nsballmann · 2025-07-30T12:46:48Z

openvoxserver/container-entrypoint.d/88-enable-cache-delete-api.sh

@@ -6,6 +6,6 @@ if [[ "$OPENVOXSERVER_ENABLE_ENV_CACHE_DEL_API" == true ]]; then
  if [[ $(grep 'puppet-admin-api' /etc/puppetlabs/puppetserver/conf.d/auth.conf) ]]; then
    echo "Admin API already set"
  else
-    /opt/puppetlabs/puppet/bin/ruby /docker-entrypoint.d/88-add_cache_del_api_auth_rules.rb
+    /opt/puppetlabs/puppet/bin/ruby /container-entrypoint.d/88-add_cache_del_api_auth_rules.rb


Suggested change

/opt/puppetlabs/puppet/bin/ruby /container-entrypoint.d/88-add_cache_del_api_auth_rules.rb

my_directory="$(dirname "$0")"

/opt/puppetlabs/puppet/bin/ruby "${my_directory}/88-add_cache_del_api_auth_rules.rb"

Same like #59 (comment)

Adjusted (in a slightly different manner).

nsballmann · 2025-07-30T12:48:31Z

openvoxserver/container-entrypoint.d/89-csr_attributes.sh

@@ -4,5 +4,5 @@ set -e

 if [ -n "${CSR_ATTRIBUTES}" ]; then
    echo "CSR Attributes: ${CSR_ATTRIBUTES}"
-    /opt/puppetlabs/puppet/bin/ruby /docker-entrypoint.d/89-csr_attributes.rb
+    /opt/puppetlabs/puppet/bin/ruby /container-entrypoint.d/89-csr_attributes.rb


Suggested change

/opt/puppetlabs/puppet/bin/ruby /container-entrypoint.d/89-csr_attributes.rb

my_directory="$(dirname "$0")"

/opt/puppetlabs/puppet/bin/ruby "${my_directory}/89-csr_attributes.rb"

Same like #59 (comment)

Adjusted (in a slightly different manner).

rwaffen · 2025-08-01T09:47:55Z

i enabled the ci for your pr. nice work and good to see a lively discussion. keep up the good work. will review in detail later. one thing: please sign your commits :)

…sh}; adjust scripts and readme Signed-off-by: Sebastian Maier <[email protected]>

Signed-off-by: Sebastian Maier <[email protected]>

…ner-entrypoint.d/ Signed-off-by: Sebastian Maier <[email protected]>

Signed-off-by: Sebastian Maier <[email protected]>

Sebastian-Maier · 2025-08-04T11:22:54Z

i enabled the ci for your pr. nice work and good to see a lively discussion. keep up the good work. will review in detail later. one thing: please sign your commits :)

The commits of the PR are now signed with GPG.

Sebastian-Maier requested a review from a team as a code owner July 30, 2025 12:08

github-project-automation bot added this to Container Todos Jul 30, 2025

nsballmann reviewed Jul 30, 2025

View reviewed changes

Sebastian-Maier force-pushed the refactor/container-entrypoint branch from 2fba4de to 8dbaf8a Compare July 31, 2025 09:16

Sebastian-Maier added 5 commits August 4, 2025 12:07

refactor: rename docker-entrypoint.{d,sh} to container-entrypoint.{d,…

68c09d4

…sh}; adjust scripts and readme Signed-off-by: Sebastian Maier <[email protected]>

refactor: add docker-entrypoint.sh for backwards compatibility

87ed773

Signed-off-by: Sebastian Maier <[email protected]>

refactor: execute scripts from both /docker-entrypoint.d/ and /contai…

1d62603

…ner-entrypoint.d/ Signed-off-by: Sebastian Maier <[email protected]>

refactor: also execute scripts in /docker-entrypoint.d/ for now

08d9200

Signed-off-by: Sebastian Maier <[email protected]>

refactor: avoid hard-coded file paths

577f134

Signed-off-by: Sebastian Maier <[email protected]>

Sebastian-Maier force-pushed the refactor/container-entrypoint branch from 8dbaf8a to 577f134 Compare August 4, 2025 10:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rename docker-entrypoint to container-entrypoint #59

Rename docker-entrypoint to container-entrypoint #59

Uh oh!

Sebastian-Maier commented Jul 30, 2025

Uh oh!

nsballmann Jul 30, 2025

Uh oh!

Sebastian-Maier Jul 31, 2025

Uh oh!

nsballmann Jul 30, 2025 •

edited

Loading

Uh oh!

Sebastian-Maier Jul 31, 2025

Uh oh!

nsballmann Jul 31, 2025

Uh oh!

nsballmann Jul 30, 2025

Uh oh!

Sebastian-Maier Jul 31, 2025

Uh oh!

nsballmann Jul 31, 2025

Uh oh!

nsballmann Jul 30, 2025 •

edited

Loading

Uh oh!

Sebastian-Maier Jul 31, 2025

Uh oh!

nsballmann Jul 30, 2025 •

edited

Loading

Uh oh!

Sebastian-Maier Jul 31, 2025

Uh oh!

rwaffen commented Aug 1, 2025 •

edited

Loading

Uh oh!

Sebastian-Maier commented Aug 4, 2025

Uh oh!

Uh oh!

	./container-entrypoint.sh "$@"
	exec ./container-entrypoint.sh "$@"

		run_custom_handler pre-default

		for f in /container-entrypoint.d/*.sh; do

	sed -e "s/GRAPHITE_HOST/$OPENVOXSERVER_GRAPHITE_HOST/" -e "s/GRAPHITE_PORT/$OPENVOXSERVER_GRAPHITE_PORT/" /container-entrypoint.d/84-metrics.conf.tmpl > /etc/puppetlabs/puppetserver/conf.d/metrics.conf
	my_directory="$(dirname "$0")"
	sed -e "s/GRAPHITE_HOST/$OPENVOXSERVER_GRAPHITE_HOST/" -e "s/GRAPHITE_PORT/$OPENVOXSERVER_GRAPHITE_PORT/" "${my_directory}/84-metrics.conf.tmpl" > /etc/puppetlabs/puppetserver/conf.d/metrics.conf

	/opt/puppetlabs/puppet/bin/ruby /container-entrypoint.d/88-add_cache_del_api_auth_rules.rb
	my_directory="$(dirname "$0")"
	/opt/puppetlabs/puppet/bin/ruby "${my_directory}/88-add_cache_del_api_auth_rules.rb"

Rename docker-entrypoint to container-entrypoint #59

Are you sure you want to change the base?

Rename docker-entrypoint to container-entrypoint #59

Uh oh!

Conversation

Sebastian-Maier commented Jul 30, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nsballmann Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nsballmann Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nsballmann Jul 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rwaffen commented Aug 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Sebastian-Maier commented Aug 4, 2025

Uh oh!

Uh oh!

nsballmann Jul 30, 2025 •

edited

Loading

nsballmann Jul 30, 2025 •

edited

Loading

nsballmann Jul 30, 2025 •

edited

Loading

rwaffen commented Aug 1, 2025 •

edited

Loading