From 573a94ab3470a0a46730f2454bcc2ad9e2bafa99 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 23 Sep 2019 19:40:44 +0200 Subject: [PATCH] Nits --- Dockerfile | 2 +- entrypoint.sh | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3f9e228..b07c2f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,6 +68,6 @@ VOLUME ["/opt/encrypted-dns/etc/keys"] EXPOSE 443/udp 443/tcp -CMD ["/etc/runit/2"] +CMD ["/entrypoint.sh", "start"] ENTRYPOINT ["/entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh index d049846..378e944 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -86,7 +86,10 @@ ensure_initialized() { start() { ensure_initialized - exec /etc/runit/2 + /opt/encrypted-dns/sbin/encrypted-dns \ + --config "$CONFIG_FILE" --dry-run | + tee "${KEYS_DIR}/provider-info.txt" + exec /etc/runit/2 /dev/null 2>/dev/null } shell() { @@ -119,7 +122,7 @@ case "$action" in start) start ;; init) shift - init $* + init "$@" ;; provider-info) provider_info ;; shell) shell ;;