From 1a61d462074a868b2563ca32c1d61399d93bfce0 Mon Sep 17 00:00:00 2001 From: Werner Beroux Date: Tue, 28 Jun 2016 14:58:56 +0000 Subject: [PATCH] Add EditorConfig and Codenvy Factory with a badge. --- .codenvy.dockerfile | 7 +++++++ .editorconfig | 12 ++++++++++++ README.md | 2 ++ entrypoint.sh | 2 +- 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .codenvy.dockerfile create mode 100644 .editorconfig diff --git a/.codenvy.dockerfile b/.codenvy.dockerfile new file mode 100644 index 0000000..c2ec8bb --- /dev/null +++ b/.codenvy.dockerfile @@ -0,0 +1,7 @@ +FROM codenvy/ubuntu_jdk8 + +# Install Ngrok +ADD https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip /ngrok.zip +RUN set -x \ + && unzip -o ngrok.zip -d /bin \ + && rm -f /ngrok.zip \ No newline at end of file diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..c718476 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +# top-most EditorConfig file +root = true + +[*] +charset = utf-8 +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{sh}] +indent_size = 4 diff --git a/README.md b/README.md index 6858f4b..8c3ad1b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Codenvy badge](http://beta.codenvy.com/factory/resources/codenvy-contribute.svg)](http://beta.codenvy.com/f?url=https://github.com/wernight/docker-ngrok 'Start development on Codenvy') + A [Docker][docker] image for [ngrok][ngrok] v2, introspected tunnels to localhost. It's based on the excellent work of [wizardapps/ngrok][wizardapps/ngrok] and [fnichol/ngrok][fnichol/ngrok]. diff --git a/entrypoint.sh b/entrypoint.sh index 7302033..7399554 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -26,7 +26,7 @@ elif [ -n "$NGROK_SUBDOMAIN" ] && [ -n "$NGROK_AUTH" ]; then ARGS="$ARGS -subdomain=$NGROK_SUBDOMAIN " elif [ -n "$NGROK_HOSTNAME" ] || [ -n "$NGROK_SUBDOMAIN" ]; then if [ -z "$NGROK_AUTH" ]; then - echo "You must specify an authentication token after registering at https://ngrok.com to use custom domains." + echo "You must specify an authentication token after registering at https://ngrok.com to use custom domains." exit 1 fi fi