IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-28 01:41:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Upgrade Go etc in build images (#29157)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-11-17 13:11:43 +01:00 committed by GitHub
parent 4dd7b7a82d
commit 4485f4d878
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -313,6 +313,6 @@
"node": ">= 12"
},
"volta": {
"node": "12.19.0"
"node": "12.19.1"
}
}

2
scripts/build/ci-build-windows/Dockerfile
View File

@ -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(\

12
scripts/build/ci-build/Dockerfile
View File

@ -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

2
scripts/build/ci-build/build-deploy.sh
View File

@ -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]}")

2
scripts/build/ci-deploy/Dockerfile
View File

@ -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 && \