summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKonstantin Pavlov <thresh@nginx.com>2021-11-30 17:00:47 +0300
committerKonstantin Pavlov <thresh@nginx.com>2021-11-30 17:00:47 +0300
commit380f2dc2bae72f259ed3c7dc11b4c52a3eb4c06b (patch)
tree18ee8c1cb85712db29319718c1b14586164df376
parentbc4968d1d781bb91ec54d80bce0f4c82f0c4cc23 (diff)
downloadunit-380f2dc2bae72f259ed3c7dc11b4c52a3eb4c06b.tar.gz
unit-380f2dc2bae72f259ed3c7dc11b4c52a3eb4c06b.tar.bz2
Docker: respect the binary from CMD in the entrypoint.
-rwxr-xr-xpkg/docker/docker-entrypoint.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/docker/docker-entrypoint.sh b/pkg/docker/docker-entrypoint.sh
index f455a958..59529925 100755
--- a/pkg/docker/docker-entrypoint.sh
+++ b/pkg/docker/docker-entrypoint.sh
@@ -24,7 +24,7 @@ if [ "$1" = "unitd" -o "$1" = "unitd-debug" ]; then
else
if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -print -quit 2>/dev/null | /bin/grep -q .; then
echo "$0: /docker-entrypoint.d/ is not empty, launching Unit daemon to perform initial configuration..."
- /usr/sbin/unitd --control unix:/var/run/control.unit.sock
+ /usr/sbin/$1 --control unix:/var/run/control.unit.sock
while [ ! -S /var/run/control.unit.sock ]; do echo "$0: Waiting for control socket to be created..."; /bin/sleep 0.1; done
# even when the control socket exists, it does not mean unit has finished initialisation