Skip to content

Commit

Permalink
fix: versioned docker builds must work now
Browse files Browse the repository at this point in the history
  • Loading branch information
allanger committed Feb 15, 2023
1 parent b596961 commit dad5fbd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion dockerfiles/Dockerfile-argo
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
ARG BASE_VERSION=latest
FROM ghcr.io/allanger/dumb-downloader as builder
ARG ARGOCD_VERSION=v2.5.10
ENV RUST_LOG=info
RUN mkdir /out
RUN dudo -l "https://github.com/argoproj/argo-cd/releases/download/{{ version }}/argocd-{{ os }}-{{ arch }}" -i /tmp/argocd -p $ARGOCD_VERSION
RUN mv /tmp/argocd /out/argocd && chmod +x /out/argocd

FROM ghcr.io/allanger/check-da-helm-base
FROM ghcr.io/allanger/check-da-helm-base:${BASE_VERSION}
COPY --from=builder /out/ /usr/bin
RUN apk update --no-cache && apk add --no-cache jq bash
ENTRYPOINT ["cdh"]
4 changes: 2 additions & 2 deletions dockerfiles/Dockerfile-helmfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_VERSION=latest
FROM ghcr.io/allanger/dumb-downloader:${BASE_VERSION} as builder
FROM ghcr.io/allanger/dumb-downloader as builder
RUN apt-get update -y && apt-get install tar -y
ARG HELM_VERSION=v3.10.3
ARG HELMFILE_VERSION=0.150.0
Expand All @@ -11,7 +11,7 @@ RUN mkdir /out && for bin in `find /tmp | grep helm`; do cp $bin /out/; done
RUN chmod +x /out/helm
RUN chmod +x /out/helmfile

FROM ghcr.io/allanger/check-da-helm-base
FROM ghcr.io/allanger/check-da-helm-base:${BASE_VERSION}
COPY --from=builder /out/ /usr/bin
RUN apk update --no-cache && apk add --no-cache jq bash
ENTRYPOINT ["cdh"]

0 comments on commit dad5fbd

Please sign in to comment.