Skip to content

Commit

Permalink
patch version and add auth plugin to main docker file (#45)
Browse files Browse the repository at this point in the history
* patch version and add gke plugin to main dockerfile

* patch version in gke dockerfile
  • Loading branch information
darkstarmv authored Mar 23, 2023
1 parent 93450cb commit 6a1d3e4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
10 changes: 8 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM golang:1.19-alpine as builder
ENV DESIRED_VERSION=v3.10.2
ENV DESIRED_VERSION=v3.11.1
ENV HELM_DIFF_VERSION=v3.5.0
WORKDIR /go/src/github.com/target/impeller
COPY . .
Expand All @@ -20,14 +20,20 @@ RUN cd /tmp && \
&& ./get_helm.sh
RUN /usr/local/bin/helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}

FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine as gcloud
RUN gcloud components install gke-gcloud-auth-plugin


FROM alpine:latest
ENV KUBECTL_VERSION=v1.24.7
ENV KUBECTL_VERSION=v1.24.12
RUN apk add ca-certificates
RUN wget -O /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
chmod +x /usr/bin/kubectl
RUN mkdir /root/.kube
ENV USE_GKE_GCLOUD_AUTH_PLUGIN=True
ENTRYPOINT ["/usr/bin/impeller"]
COPY --from=gcloud /google-cloud-sdk/bin/gke-gcloud-auth-plugin /bin/gke-gcloud-auth-plugin
ENV USE_GKE_GCLOUD_AUTH_PLUGIN=True
COPY --from=builder /go/src/github.com/target/impeller/impeller /usr/bin/impeller
COPY --from=builder /usr/local/bin/helm /usr/local/bin/helm
COPY --from=builder /root/.local /root/.local
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile-gcloud
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM golang:1.19-alpine as builder
ENV DESIRED_VERSION=v3.10.2
ENV DESIRED_VERSION=v3.11.1
ENV HELM_DIFF_VERSION=v3.5.0
WORKDIR /go/src/github.com/target/impeller
COPY . .
Expand All @@ -24,7 +24,7 @@ RUN /usr/local/bin/helm plugin install https://github.com/databus23/helm-diff --
FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine
RUN gcloud components install gke-gcloud-auth-plugin

ENV KUBECTL_VERSION=v1.24.7
ENV KUBECTL_VERSION=v1.24.12
RUN apk add ca-certificates
RUN wget -O /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
chmod +x /usr/bin/kubectl
Expand Down

0 comments on commit 6a1d3e4

Please sign in to comment.