diff --git a/Dockerfile b/Dockerfile index 33bfb80..7ef5b73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ ARG SP_CERTS="itoacr.azurecr.io/ito/sp-certs:0.6" FROM ${SP_CERTS} AS certs -FROM alpine:3.11.6 AS build -ENV KUBE_LATEST_VERSION=v1.17.6 -ENV HELM_VERSION=v3.2.3 +FROM alpine:3.12.0 AS build +ENV KUBE_LATEST_VERSION=v1.17.7 +ENV HELM_VERSION=v3.2.4 ENV HELM_FILENAME=helm-${HELM_VERSION}-linux-amd64.tar.gz -LABEL VERSION="v0.0.1" +LABEL VERSION="v0.2.1" LABEL RELEASE="pipetools-k8s" LABEL MAINTAINER="marcinbojko" -SHELL ["/bin/ash", "-eo", "pipefail", "-c"] +SHELL ["/bin/ash", "-euo", "pipefail", "-c"] # shellcheck disable=SC2169 RUN apk add --no-cache --update -t deps ca-certificates curl bash gettext tar gzip openssl openssh rsync python3 python3-dev py3-pip \ && pip3 install --upgrade pip yamllint dos2unix jmespath \ - && curl -sL https://storage.googleapis.com/kubernetes-release/release/${KUBE_LATEST_VERSION}/bin/linux/amd64/kubectl -o /bin/kubectl && chmod +x /bin/kubectl \ - && curl -sL https://get.helm.sh/${HELM_FILENAME} | tar xz && mv linux-amd64/helm /bin/helm && rm -rf linux-amd64 && chmod +x /bin/helm \ + && curl -fsL https://storage.googleapis.com/kubernetes-release/release/${KUBE_LATEST_VERSION}/bin/linux/amd64/kubectl -o /bin/kubectl && chmod +x /bin/kubectl \ + && curl -sfL https://get.helm.sh/${HELM_FILENAME} | tar xz && mv linux-amd64/helm /bin/helm && rm -rf linux-amd64 && chmod +x /bin/helm \ && mkdir -p ~/.ssh \ && eval "$(ssh-agent -s)" \ && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config \ diff --git a/README.md b/README.md index d198605..a22e97e 100644 --- a/README.md +++ b/README.md @@ -1 +1,8 @@ -pipetools-k8s +# pipetools-k8s + +## Revision + +|version|helm version|kubectl version| +|-------|------------|---------------| +|0.1.0 |v3.2.3 |v1.17.6 | +|0.2.1 |v3.2.4 |v1.17.7 |