Merge pull request #19 from jrasell/fix-dockerfile-small

Update Dockerfiles to use ENTRYPOINT correctly and env var version
jrasell · Aug 1, 2019 · b6ccb1d · b6ccb1d
2 parents 496ecfb + 344d37b
commit b6ccb1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -33,4 +33,6 @@ RUN \
         && chmod +x /usr/bin/sherpa \
         && echo "Build complete."
 
-CMD ["sherpa", "--help"]
+ENTRYPOINT ["sherpa"]
+
+CMD ["--help"]