From 4485f4d8786a75f551d661114b383c84ff35c5e4 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Tue, 17 Nov 2020 13:11:43 +0100 Subject: [PATCH] Chore: Upgrade Go etc in build images (#29157) Signed-off-by: Arve Knudsen --- package.json | 2 +- scripts/build/ci-build-windows/Dockerfile | 2 +- scripts/build/ci-build/Dockerfile | 12 ++++++------ scripts/build/ci-build/build-deploy.sh | 2 +- scripts/build/ci-deploy/Dockerfile | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 48843eeca06..d58b0057b98 100644 --- a/package.json +++ b/package.json @@ -313,6 +313,6 @@ "node": ">= 12" }, "volta": { - "node": "12.19.0" + "node": "12.19.1" } } diff --git a/scripts/build/ci-build-windows/Dockerfile b/scripts/build/ci-build-windows/Dockerfile index 9cb29deb0aa..128acf83606 100644 --- a/scripts/build/ci-build-windows/Dockerfile +++ b/scripts/build/ci-build-windows/Dockerfile @@ -8,7 +8,7 @@ RUN powershell Invoke-Expression (New-Object System.Net.WebClient).DownloadStrin # Scoop first of all needs git to update itself # Run Scoop under PowerShell since it can otherwise fail RUN powershell -Command scoop install git@2.29.1.windows.1 -RUN powershell -Command scoop install go@1.15.3 unzip@6.00 gcc@9.3.0-2 +RUN powershell -Command scoop install go@1.15.5 unzip@6.00 gcc@9.3.0-2 # Install diffutils, in case we need them RUN powershell (New-Object Net.WebClient).DownloadFile(\ diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index 94ee0716081..60cecc458ed 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -1,5 +1,5 @@ # Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's. -FROM debian:stretch-20200908-slim AS toolchain +FROM debian:stretch-20201012-slim AS toolchain ENV OSX_MIN=10.10 \ CTNG=1.24.0 \ @@ -73,8 +73,8 @@ RUN cd /tmp && \ rm -rf /tmp/x86_64-centos6-linux-gnu/ && \ rm -rf /tmp/crosstool-ng-${CTNG} -ARG GOLANGCILINT_VERSION=1.31.0 -ARG GOLANGCILINT_CHKSUM=9a5d47b51442d68b718af4c7350f4406cdc087e2236a5b9ae52f37aebede6cb3 +ARG GOLANGCILINT_VERSION=1.32.2 +ARG GOLANGCILINT_CHKSUM=e7ab86d833bf9faed39801ab3b5cd294f026d26f9a7da63a42390943ead486cc RUN curl -fLO https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz RUN echo ${GOLANGCILINT_CHKSUM} golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz | sha256sum --check --strict --status @@ -83,12 +83,12 @@ RUN mv golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64/golangci-lint /tmp/ # Base image to crossbuild grafana. # Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's. -FROM debian:stretch-20200908 +FROM debian:stretch-20201012 -ENV GOVERSION=1.15.1 \ +ENV GOVERSION=1.15.5 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ - NODEVERSION=12.19.0-1nodesource1 \ + NODEVERSION=12.19.1-1nodesource1 \ YARNVERSION=1.22.5-1 \ GO111MODULE=on diff --git a/scripts/build/ci-build/build-deploy.sh b/scripts/build/ci-build/build-deploy.sh index ef327b499f0..50445496647 100755 --- a/scripts/build/ci-build/build-deploy.sh +++ b/scripts/build/ci-build/build-deploy.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eo pipefail -_version="1.2.28" +_version="1.2.29" _tag="grafana/build-container:${_version}" _dpath=$(dirname "${BASH_SOURCE[0]}") diff --git a/scripts/build/ci-deploy/Dockerfile b/scripts/build/ci-deploy/Dockerfile index 0b2da959996..55d49684c74 100644 --- a/scripts/build/ci-deploy/Dockerfile +++ b/scripts/build/ci-deploy/Dockerfile @@ -1,4 +1,4 @@ -FROM cimg/go:1.15.1 +FROM cimg/go:1.15.5 RUN git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-dev/aptly RUN cd $GOPATH/src/github.com/aptly-dev/aptly && \