From 29192c5acd1f79572f3f46bd00185fe39491549b Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 8 Apr 2021 14:22:25 -0700 Subject: [PATCH 1/2] fix(ci): remove Go --- ci/images/debian10/Dockerfile | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/ci/images/debian10/Dockerfile b/ci/images/debian10/Dockerfile index 397316c2babb..acf1bfbf74d8 100644 --- a/ci/images/debian10/Dockerfile +++ b/ci/images/debian10/Dockerfile @@ -6,13 +6,13 @@ RUN apt-get update RUN apt-get install -y curl gnupg # Installs node. -RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - && \ - apt-get install -y nodejs +RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \ + && apt-get install -y nodejs # Installs yarn. -RUN curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - apt-get update && apt-get install -y yarn +RUN curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ + && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ + && apt-get update && apt-get install -y yarn # Installs VS Code build deps. RUN apt-get install -y build-essential @@ -24,25 +24,17 @@ RUN apt-get install -y gettext-base RUN apt-get install -y git rsync unzip jq # Installs shellcheck. -RUN curl -fsSL https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.$(uname -m).tar.xz | \ - tar -xJ && \ - mv shellcheck*/shellcheck /usr/local/bin && \ - rm -R shellcheck* - -# Install Go. -RUN ARCH="$(uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/')" && \ - curl -fsSL "https://dl.google.com/go/go1.14.3.linux-$ARCH.tar.gz" | tar -C /usr/local -xz -ENV GOPATH=/gopath -# Ensures running this image as another user works. -RUN mkdir -p $GOPATH && chmod -R 777 $GOPATH -ENV PATH=/usr/local/go/bin:$GOPATH/bin:$PATH +RUN curl -fsSL https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.$(uname -m).tar.xz \ + | tar -xJ \ + && mv shellcheck*/shellcheck /usr/local/bin \ + && rm -R shellcheck* # More stable than go get RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/nfpm.sh | sh -RUN VERSION="$(curl -fsSL https://storage.googleapis.com/kubernetes-release/release/stable.txt)" && \ - curl -fsSL "https://storage.googleapis.com/kubernetes-release/release/$VERSION/bin/linux/amd64/kubectl" > /usr/local/bin/kubectl \ - && chmod +x /usr/local/bin/kubectl +RUN VERSION="$(curl -fsSL https://storage.googleapis.com/kubernetes-release/release/stable.txt)" \ + && curl -fsSL "https://storage.googleapis.com/kubernetes-release/release/$VERSION/bin/linux/amd64/kubectl" >/usr/local/bin/kubectl \ + && chmod +x /usr/local/bin/kubectl RUN curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash RUN helm plugin install https://github.com/instrumenta/helm-kubeval From 0b2bd14d436a4488fbfdb4fea0236eb9b8ddcb38 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 8 Apr 2021 14:22:40 -0700 Subject: [PATCH 2/2] fix(ci): only rely on GitHub for nfpm --- ci/images/debian10/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/images/debian10/Dockerfile b/ci/images/debian10/Dockerfile index acf1bfbf74d8..df7da48826b3 100644 --- a/ci/images/debian10/Dockerfile +++ b/ci/images/debian10/Dockerfile @@ -29,8 +29,8 @@ RUN curl -fsSL https://github.com/koalaman/shellcheck/releases/download/v0.7.1/s && mv shellcheck*/shellcheck /usr/local/bin \ && rm -R shellcheck* -# More stable than go get -RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/nfpm.sh | sh +# Using GitHub release URL is better because now only rely on one service instead of GitHub and install.goreleaser.com +RUN curl -sSL https://github.com/goreleaser/nfpm/releases/download/v2.3.1/nfpm_2.3.1_Linux_x86_64.tar.gz | tar -C /tmp -zxv nfpm RUN VERSION="$(curl -fsSL https://storage.googleapis.com/kubernetes-release/release/stable.txt)" \ && curl -fsSL "https://storage.googleapis.com/kubernetes-release/release/$VERSION/bin/linux/amd64/kubectl" >/usr/local/bin/kubectl \