From 79a0bd260887df8850d50c01c72b25720843c64e Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Sun, 2 Oct 2016 23:09:09 -0700 Subject: [PATCH 1/2] gosu check now matches as many digits as are present in the release number. Fixes 1.10 being detected as non-existent 1.1. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e2a48f8..f9d43a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ ADD . /webui-aria2 # gosu install latest RUN GITHUB_REPO="https://github.com/tianon/gosu" \ - && LATEST=`curl -s $GITHUB_REPO"/releases/latest" | grep -Eo "[0-9].[0-9]"` \ + && LATEST=`curl -s $GITHUB_REPO"/releases/latest" | grep -Eo "[0-9].[0-9]*"` \ && curl -L $GITHUB_REPO"/releases/download/"$LATEST"/gosu-amd64" > /usr/local/bin/gosu \ && chmod +x /usr/local/bin/gosu From 301e50cbfa7ace6128ec68dde505e9bea0268d45 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Sun, 2 Oct 2016 23:10:26 -0700 Subject: [PATCH 2/2] Remove -e from echo, as it gets emitted by BusyBox echo command. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f9d43a0..ca681a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN GITHUB_REPO="https://github.com/mattn/goreman" \ && tar -xvzf goreman.tar.gz && mv /goreman_linux_amd64/goreman /usr/local/bin/goreman && rm -R goreman* # goreman setup -RUN echo -e "web: gosu dummy /bin/busybox httpd -f -p 8080 -h /webui-aria2\nbackend: gosu dummy /usr/bin/aria2c --enable-rpc --rpc-listen-all --dir=/data" > Procfile +RUN echo "web: gosu dummy /bin/busybox httpd -f -p 8080 -h /webui-aria2\nbackend: gosu dummy /usr/bin/aria2c --enable-rpc --rpc-listen-all --dir=/data" > Procfile EXPOSE 8080 6800 CMD ["goreman", "start"]