From dad5fbdb151d89bbbe8697bbaae06079d3303d8d Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Wed, 15 Feb 2023 10:02:02 +0100 Subject: [PATCH] fix: versioned docker builds must work now --- dockerfiles/Dockerfile-argo | 3 ++- dockerfiles/Dockerfile-helmfile | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dockerfiles/Dockerfile-argo b/dockerfiles/Dockerfile-argo index 3d25b9b..f71de2e 100644 --- a/dockerfiles/Dockerfile-argo +++ b/dockerfiles/Dockerfile-argo @@ -1,3 +1,4 @@ +ARG BASE_VERSION=latest FROM ghcr.io/allanger/dumb-downloader as builder ARG ARGOCD_VERSION=v2.5.10 ENV RUST_LOG=info @@ -5,7 +6,7 @@ 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"] diff --git a/dockerfiles/Dockerfile-helmfile b/dockerfiles/Dockerfile-helmfile index 1f165df..01827d7 100644 --- a/dockerfiles/Dockerfile-helmfile +++ b/dockerfiles/Dockerfile-helmfile @@ -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 @@ -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"]