From 344d37bf201410b9d94a3d3e3784a984bf469142 Mon Sep 17 00:00:00 2001 From: James Rasell Date: Wed, 31 Jul 2019 14:15:55 +0200 Subject: [PATCH] Update Dockerfiles to use ENTRYPOINT correctly and env var version --- Dockerfile | 6 ++++-- Dockerfile.build | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70214ee..7b0818a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,9 +13,11 @@ RUN buildDeps=' \ ' \ set -x \ && apk --no-cache add $buildDeps ca-certificates \ - && wget -O sherpa https://github.com/jrasell/sherpa/releases/download/v0.0.1/sherpa_0.0.1_linux_amd64 \ + && wget -O sherpa https://github.com/jrasell/sherpa/releases/download/v${SHERPA_VERSION}/sherpa_${SHERPA_VERSION}_linux_amd64 \ && chmod +x /usr/bin/sherpa \ && apk del $buildDeps \ && echo "Build complete." -CMD ["sherpa", "--help"] +ENTRYPOINT ["sherpa"] + +CMD ["--help"] diff --git a/Dockerfile.build b/Dockerfile.build index fd03736..1b5b463 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -33,4 +33,6 @@ RUN \ && chmod +x /usr/bin/sherpa \ && echo "Build complete." -CMD ["sherpa", "--help"] +ENTRYPOINT ["sherpa"] + +CMD ["--help"]