From 1ae85758f0c725ce53c17388641c0e20555a5549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20G=C3=BCnther?= Date: Fri, 6 Dec 2019 12:31:26 +0100 Subject: [PATCH 1/2] Support relay password for docker --- Dockerfile | 3 +-- README.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9cfa3bc4..2b693acc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,5 +11,4 @@ EXPOSE 9011 EXPOSE 9012 EXPOSE 9013 COPY --from=builder /go/croc/croc /croc -ENTRYPOINT ["/croc"] -CMD ["relay"] +CMD ["sh", "-c", "/croc --pass $CROC_PASS relay"] diff --git a/README.md b/README.md index 68acb0dc..7c4e1c25 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 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 From 06dd3ba62f4c8c63fd3a0e5b8b97613fd7a18da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20G=C3=BCnther?= Date: Fri, 6 Dec 2019 14:49:45 +0100 Subject: [PATCH 2/2] 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 2b693acc..e05417e6 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 7c4e1c25..0974a3ca 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 00000000..c0350286 --- /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 "$@"