diff --git a/Dockerfile b/Dockerfile index eb3e685..c49a143 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,15 @@ FROM docker.io/library/alpine:3.14 ARG HELM_VERSION -COPY install.sh /install.sh -RUN VERSION=${HELM_VERSION} /install.sh +RUN apk add bash curl git openssl && \ + curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 --output /tmp/install.sh + +RUN [[ ${HELM_VERSION} == "" ]]; bash /tmp/install.sh +RUN [[ ${HELM_VERSION} != "" ]]; bash /tmp/install.sh --version ${HELM_VERSION} + +RUN rm /tmp/install.sh # Install additionally cm-push plugin RUN helm plugin install https://github.com/chartmuseum/helm-push.git -ENTRYPOINT [ "/usr/bin/helm" ] +ENTRYPOINT [ "/usr/local/bin/helm" ] diff --git a/Makefile b/Makefile index 82a63b8..0d6f283 100644 --- a/Makefile +++ b/Makefile @@ -49,4 +49,4 @@ container-image/push: # ============================================================================== # Declare the contents of the PHONY variable as phony. We keep that information # in a variable so we can use it in if_changed. -.PHONY: ${PHONY} \ No newline at end of file +.PHONY: ${PHONY} diff --git a/install.sh b/install.sh deleted file mode 100755 index 54e5067..0000000 --- a/install.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -set -xe - -BASE_URL=https://get.helm.sh - -if [ -z ${VERSION+x} ]; then - echo ${VERSION} not defined - exit 1 -fi - -case `uname -m` in - x86_64) - ARCH=amd64 - ;; - armv7l) - ARCH=arm - ;; - aarch64) - ARCH=arm64 - ;; - ppc64le) - ARCH=ppc64le - ;; - s390x) - ARCH=s390x - ;; - *) - echo "un-supported arch, exit ..." - exit 1 - ;; -esac - -apk add --update --no-cache wget git -wget ${BASE_URL}/helm-${VERSION}-linux-${ARCH}.tar.gz -O - | tar -xz -mv linux-${ARCH}/helm /usr/bin/helm -chmod +x /usr/bin/helm -rm -rf linux-${ARCH} \ No newline at end of file