Skip to content

Commit

Permalink
Merge pull request #660 from Praqma/update-os-deps-plugins-20-may-2022
Browse files Browse the repository at this point in the history
Update helm, helm plugins, alpine and golang versions
  • Loading branch information
luisdavim authored May 22, 2022
2 parents e7e4d06 + 434d31c commit 6676de4
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- run:
name: build docker images and push them to dockerhub
command: |
helm_versions=( "v3.6.3" "v3.7.2" "v3.8.1" )
helm_versions=( "v3.7.2" "v3.8.2" "v3.9.0" )
TAG=$(git describe --abbrev=0 --tags)
docker login -u $DOCKER_USER -p $DOCKER_PASS
Expand Down
28 changes: 18 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
ARG GO_VERSION="1.17.0"
ARG ALPINE_VERSION="3.14"
ARG GLOBAL_KUBE_VERSION="v1.22.1"
ARG GLOBAL_HELM_VERSION="v3.8.1"
ARG GLOBAL_HELM_DIFF_VERSION="v3.1.3"
ARG GLOBAL_SOPS_VERSION="v3.7.1"
ARG GO_VERSION="1.17.10"
ARG ALPINE_VERSION="3.15"
ARG GLOBAL_KUBE_VERSION="v1.23.6"
ARG GLOBAL_HELM_VERSION="v3.9.0"
ARG GLOBAL_HELM_DIFF_VERSION="v3.5.0"
ARG GLOBAL_HELM_GCS_VERSION="0.3.21"
ARG GLOBAL_HELM_S3_VERSION="v0.10.0"
ARG GLOBAL_HELM_SECRETS_VERSION="v3.13.0"
ARG GLOBAL_SOPS_VERSION="v3.7.3"

### Helm Installer ###
FROM alpine:${ALPINE_VERSION} as helm-installer
ARG GLOBAL_KUBE_VERSION
ARG GLOBAL_HELM_VERSION
ARG GLOBAL_HELM_DIFF_VERSION
ARG GLOBAL_HELM_GCS_VERSION
ARG GLOBAL_HELM_S3_VERSION
ARG GLOBAL_HELM_SECRETS_VERSION
ARG GLOBAL_SOPS_VERSION
ENV KUBE_VERSION=$GLOBAL_KUBE_VERSION
ENV HELM_VERSION=$GLOBAL_HELM_VERSION
ENV HELM_DIFF_VERSION=$GLOBAL_HELM_DIFF_VERSION
ENV HELM_GCS_VERSION=$GLOBAL_HELM_GCS_VERSION
ENV HELM_S3_VERSION=$GLOBAL_HELM_S3_VERSION
ENV HELM_SECRETS_VERSION=$GLOBAL_HELM_SECRETS_VERSION
ENV SOPS_VERSION=$GLOBAL_SOPS_VERSION

RUN apk add --update --no-cache ca-certificates git openssh openssl ruby curl wget tar gzip make bash
Expand All @@ -28,11 +37,10 @@ RUN curl --retry 5 -Lk https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.
RUN mv /tmp/linux-amd64/helm /usr/local/bin/helm && rm -rf /tmp/linux-amd64
RUN chmod +x /usr/local/bin/helm

RUN helm plugin install https://github.com/hypnoglow/helm-s3.git
RUN helm plugin install https://github.com/nouney/helm-gcs
RUN helm plugin install https://github.com/hypnoglow/helm-s3.git --version ${HELM_S3_VERSION}
RUN helm plugin install https://github.com/nouney/helm-gcs --version ${HELM_GCS_VERSION}
RUN helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
RUN helm plugin install https://github.com/jkroepke/helm-secrets
RUN rm -r /tmp/helm-diff /tmp/helm-diff.tgz
RUN helm plugin install https://github.com/jkroepke/helm-secrets --version ${HELM_SECRETS_VERSION}

### Go Builder & Tester ###
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} as builder
Expand Down

0 comments on commit 6676de4

Please sign in to comment.