Don't force users to set $CROC_PASS

schollz · Dec 7, 2019 · 06dd3ba · 06dd3ba
1 parent 1ae8575
commit 06dd3ba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+if [ -n "$CROC_PASS" ]; then
+    set -- --pass "$CROC_PASS" "$@"
+fi
+exec /croc "$@"
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@