From 1ccb1f64e9ac21a911e62407fe63de42955ebc38 Mon Sep 17 00:00:00 2001 From: hajowieland Date: Mon, 29 Jan 2024 09:54:48 +0100 Subject: [PATCH 1/4] chore: use same curl argument order for all commands --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0acfaf7..f27368e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,7 +66,7 @@ RUN pip3 install --no-cache-dir \ # Helm3 RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; else echo "Unsupported Architeture" && exit 1; fi && \ - curl -SsL "https://get.helm.sh/helm-v${HELM}-linux-${ARCHITECTURE}.tar.gz" | tar -xzO "linux-${ARCHITECTURE}/helm" > /usr/local/bin/helm && \ + curl -sLS "https://get.helm.sh/helm-v${HELM}-linux-${ARCHITECTURE}.tar.gz" | tar -xzO "linux-${ARCHITECTURE}/helm" > /usr/local/bin/helm && \ chmod +x /usr/local/bin/helm # Helm plugins @@ -110,7 +110,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$ # yq RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; else ARCHITECTURE=amd64; fi && \ - curl -SsL -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v${YQ}/yq_linux_${ARCHITECTURE} && \ + curl -sLS -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v${YQ}/yq_linux_${ARCHITECTURE} && \ chmod +x /usr/local/bin/yq WORKDIR /work From 121ca50675a412679891757e03ad8776066382e3 Mon Sep 17 00:00:00 2001 From: hajowieland Date: Mon, 29 Jan 2024 10:01:38 +0100 Subject: [PATCH 2/4] feat: add chart-testing default configs to /etc/ct so no explicit config needs to be provided --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f27368e..f75c512 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,8 +75,8 @@ RUN helm plugin install https://github.com/jkroepke/helm-secrets --version "v${H # chart-testing RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; else echo "Unsupported Architeture" && exit 1; fi && \ - curl -sLS "https://github.com/helm/chart-testing/releases/download/v${CT}/chart-testing_${CT}_linux_${ARCHITECTURE}.tar.gz" | tar -xzO ct > /usr/local/bin/ct && \ - chmod +x /usr/local/bin/ct + curl -sLS "https://github.com/helm/chart-testing/releases/download/v${CT}/chart-testing_${CT}_linux_${ARCHITECTURE}.tar.gz" > ct.tar.gz && \ + tar -xzf ct.tar.gz && mv ct /usr/local/bin/ct && chmod a+x /usr/local/bin/ct && mkdir /etc/ct && cp etc/* /etc/ct # kubectl RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=linux/amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=linux/arm64; else echo "Unsupported Architeture" && exit 1; fi && \ From a991a0cc6b86015d0c137819ab3dae04489cda53 Mon Sep 17 00:00:00 2001 From: hajowieland Date: Mon, 29 Jan 2024 10:04:35 +0100 Subject: [PATCH 3/4] feat: version bump of all apt packages --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f75c512..ec7def0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,15 +40,15 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Instal packages RUN apt-get update && apt-get install -y --no-install-recommends \ - tzdata=2023c-0ubuntu0.22.04.2 \ + tzdata=2023d-0ubuntu0.22.04 \ ca-certificates=20230311ubuntu0.22.04.1 \ - curl=7.81.0-1ubuntu1.13 \ + curl=7.81.0-1ubuntu1.15 \ git=1:2.34.1-1ubuntu1.10 \ gnupg=2.2.27-3ubuntu2.1 \ jq=1.6-2.1ubuntu3 \ make=4.3-4.1build1 \ - openssh-client=1:8.9p1-3ubuntu0.3 \ - python3-pip=22.0.2+dfsg-1ubuntu0.3 \ + openssh-client=1:8.9p1-3ubuntu0.6 \ + python3-pip=22.0.2+dfsg-1ubuntu0.4 \ wget=1.21.2-2ubuntu1 \ && rm -rf /var/lib/apt/lists/* From 80133d475680616cb647a13bea595b7e667fdfe3 Mon Sep 17 00:00:00 2001 From: hajowieland Date: Mon, 29 Jan 2024 10:24:24 +0100 Subject: [PATCH 4/4] fix: chart-testing config files extraction and cleanup /tmp afterwards --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec7def0..23ed9ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,8 +75,9 @@ RUN helm plugin install https://github.com/jkroepke/helm-secrets --version "v${H # chart-testing RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=arm64; else echo "Unsupported Architeture" && exit 1; fi && \ - curl -sLS "https://github.com/helm/chart-testing/releases/download/v${CT}/chart-testing_${CT}_linux_${ARCHITECTURE}.tar.gz" > ct.tar.gz && \ - tar -xzf ct.tar.gz && mv ct /usr/local/bin/ct && chmod a+x /usr/local/bin/ct && mkdir /etc/ct && cp etc/* /etc/ct + curl -sLS "https://github.com/helm/chart-testing/releases/download/v${CT}/chart-testing_${CT}_linux_${ARCHITECTURE}.tar.gz" > /tmp/ct.tar.gz && \ + tar -xzf /tmp/ct.tar.gz -C /tmp/ && mv /tmp/ct /usr/local/bin/ct && chmod a+x /usr/local/bin/ct && mkdir /etc/ct && cp /tmp/etc/* /etc/ct/ && \ + rm -rf /tmp/* # kubectl RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ARCHITECTURE=linux/amd64; elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then ARCHITECTURE=linux/arm64; else echo "Unsupported Architeture" && exit 1; fi && \