fix: versioned docker builds must work now

This commit is contained in:
Nikolai Rodionov 2023-02-15 10:02:02 +01:00
parent b596961291
commit dad5fbdb15
2 changed files with 4 additions and 3 deletions

View File

@ -1,3 +1,4 @@
ARG BASE_VERSION=latest
FROM ghcr.io/allanger/dumb-downloader as builder FROM ghcr.io/allanger/dumb-downloader as builder
ARG ARGOCD_VERSION=v2.5.10 ARG ARGOCD_VERSION=v2.5.10
ENV RUST_LOG=info 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 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 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 COPY --from=builder /out/ /usr/bin
RUN apk update --no-cache && apk add --no-cache jq bash RUN apk update --no-cache && apk add --no-cache jq bash
ENTRYPOINT ["cdh"] ENTRYPOINT ["cdh"]

View File

@ -1,5 +1,5 @@
ARG BASE_VERSION=latest 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 RUN apt-get update -y && apt-get install tar -y
ARG HELM_VERSION=v3.10.3 ARG HELM_VERSION=v3.10.3
ARG HELMFILE_VERSION=0.150.0 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/helm
RUN chmod +x /out/helmfile 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 COPY --from=builder /out/ /usr/bin
RUN apk update --no-cache && apk add --no-cache jq bash RUN apk update --no-cache && apk add --no-cache jq bash
ENTRYPOINT ["cdh"] ENTRYPOINT ["cdh"]