From 06dd3ba62f4c8c63fd3a0e5b8b97613fd7a18da8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorben=20G=C3=BCnther?= <admin@xenrox.net>
Date: Fri, 6 Dec 2019 14:49:45 +0100
Subject: [PATCH] Don't force users to set $CROC_PASS

---
 Dockerfile         | 5 +++--
 README.md          | 2 +-
 croc-entrypoint.sh | 6 ++++++
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100755 croc-entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index 2b693ac..e05417e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,5 +10,6 @@ EXPOSE 9010
 EXPOSE 9011
 EXPOSE 9012
 EXPOSE 9013
-COPY --from=builder /go/croc/croc /croc
-CMD ["sh", "-c", "/croc --pass $CROC_PASS relay"]
+COPY --from=builder /go/croc/croc /go/croc/croc-entrypoint.sh /
+ENTRYPOINT ["/croc-entrypoint.sh"]
+CMD ["relay"]
diff --git a/README.md b/README.md
index 7c4e1c2..0974a3c 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ If it's easier you can also run a relay with Docker:
 
 
 ```
-$ docker run -d -p 9009:9009 -p 9010:9010 -p 9011:9011 -p 9012:9012 -p 9013:9013 -e CROC_PASS YOURPASSWORD schollz/croc
+$ docker run -d -p 9009:9009 -p 9010:9010 -p 9011:9011 -p 9012:9012 -p 9013:9013 -e CROC_PASS='YOURPASSWORD' schollz/croc
 ```
 
 ## License
diff --git a/croc-entrypoint.sh b/croc-entrypoint.sh
new file mode 100755
index 0000000..c035028
--- /dev/null
+++ b/croc-entrypoint.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+if [ -n "$CROC_PASS" ]; then
+    set -- --pass "$CROC_PASS" "$@"
+fi
+exec /croc "$@"