opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-03 04:12:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

CI: Upgrade Dockerfiles wrt. Go, Node, Debian (#31407)

Browse Source 
* CI: Upgrade Dockerfiles wrt. Go 1.16, Node, Debian

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2021-02-24 08:52:48 +01:00
committed by GitHub
parent 4429f2cf58
commit 357cd8eb81
14 changed files with 207 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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.5 unzip@6.00 gcc@9.3.0-2
RUN powershell -Command scoop install go@1.16 unzip@6.00 gcc@9.3.0-2
# Install diffutils, in case we need them
RUN powershell (New-Object Net.WebClient).DownloadFile(\
@ -21,10 +21,10 @@ RUN mkdir -p "C:\Program Files (x86)\GnuWin32"
RUN cd "C:\Program Files (x86)\GnuWin32" && unzip C:\App\diffutils-dep.zip && unzip C:\App\diffutils-bin.zip
RUN powershell (New-Object Net.WebClient).DownloadFile(\
\"https://github.com/golangci/golangci-lint/releases/download/v1.37.0/golangci-lint-1.37.0-windows-amd64.zip\", \
\"https://github.com/golangci/golangci-lint/releases/download/v1.37.1/golangci-lint-1.37.1-windows-amd64.zip\", \
\"golangci-lint.zip\")
RUN powershell (Get-FileHash golangci-lint.zip -Algorithm SHA256).Hash -eq \
\"4b72c442d78a80bdfb7a775a55a9296beecc80afff6ef6ce9c727a573031278d"
\"a11b73bebd0ab6f2161d3677a5c63883001bf489aeebc494a6aaaead6addd161"
RUN unzip golangci-lint.zip
RUN powershell -Command mv golangci-lint-1.32.0-windows-amd64\golangci-lint.exe .

15
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-20201209 AS toolchain
FROM debian:stretch-20210208 AS toolchain
ENV OSX_MIN=10.10 \
CTNG=1.24.0 \
@ -76,8 +76,8 @@ RUN cd /tmp && \
rm -rf /tmp/x86_64-centos6-linux-gnu/ && \
rm -rf /tmp/crosstool-ng-${CTNG}
ARG GOLANGCILINT_VERSION=1.37.0
ARG GOLANGCILINT_CHKSUM=5fe9852e754b621c5264fb8ac810a75033e7f18e972315a60c5c3f8a37b3cb88
ARG GOLANGCILINT_VERSION=1.37.1
ARG GOLANGCILINT_CHKSUM=1929425d7733d136b342395c77f171d459aa89b198933465ec4c854aa34c41a2
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
@ -98,14 +98,13 @@ RUN tar xf cue_${CUE_VERSION}_Linux_x86_64.tar.gz -C /tmp cue
# 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-20201209
FROM debian:stretch-20210208
ENV GOVERSION=1.15.6 \
ENV GOVERSION=1.16 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=14.15.4-1nodesource1 \
YARNVERSION=1.22.5-1 \
GO111MODULE=on
NODEVERSION=14.15.5-1nodesource1 \
YARNVERSION=1.22.5-1
# Use ARG so as not to persist environment variable in image
ARG DEBIAN_FRONTEND=noninteractive

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

@ -1,8 +1,8 @@
FROM debian:testing-20210111-slim
# Use ARG so as not to persist environment variable in image
ARG GOVERSION=1.15.8 \
GO_CHECKSUM=d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b \
ARG GOVERSION=1.16 \
GO_CHECKSUM=013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 \
DEBIAN_FRONTEND=noninteractive
ENV PATH=/usr/local/go/bin:$PATH \

2
scripts/go/go.mod
View File

@ -3,7 +3,7 @@ module github.com/grafana/grafana/scripts/go
go 1.14
require (
github.com/golangci/golangci-lint v1.37.0
github.com/golangci/golangci-lint v1.37.1
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mgechev/revive v1.0.3
github.com/russross/blackfriday/v2 v2.1.0 // indirect

4
scripts/go/go.sum
View File

@ -47,6 +47,8 @@ github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/charithe/durationcheck v0.0.3 h1:W+9cu38epH7otBF96pdhbFw5vLilsl1oseMOiOgex5E=
github.com/charithe/durationcheck v0.0.3/go.mod h1:0oCYOIgY8Om3hZxPedxKn0mzy0rneKTWJhRm+r6Gl20=
github.com/charithe/durationcheck v0.0.4 h1:lD3ud3KJ2DaoL80EZ768cSBv3DS8Xr7nNgN+kgW1tts=
github.com/charithe/durationcheck v0.0.4/go.mod h1:0oCYOIgY8Om3hZxPedxKn0mzy0rneKTWJhRm+r6Gl20=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@ -150,6 +152,8 @@ github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS
github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU=
github.com/golangci/golangci-lint v1.37.0 h1:jhxIiiPucX/mOiRP8PbfKg7IHjaBUmInx2kxRBZD3Us=
github.com/golangci/golangci-lint v1.37.0/go.mod h1:BlaDtSbtsbLI3bY3yX1rz6PaLWZG0PQDV/fqUEBrJZo=
github.com/golangci/golangci-lint v1.37.1 h1:Unt38FmBltdoILo6oQUMp6PuxwWbJ1YyNSStCrvA7+8=
github.com/golangci/golangci-lint v1.37.1/go.mod h1:zOcxSdfQDe6AE9andI1mH5mBmOQwmRg0U2kW2a6WhpA=
github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc h1:gLLhTLMk2/SutryVJ6D4VZCU3CUqr8YloG7FPIBWFpI=
github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU=
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA=

4
scripts/lib.star
View File

@ -1,8 +1,8 @@
grabpl_version = '0.5.43'
build_image = 'grafana/build-container:1.3.2'
build_image = 'grafana/build-container:1.4.0'
publish_image = 'grafana/grafana-ci-deploy:1.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
alpine_image = 'alpine:3.12'
alpine_image = 'alpine:3.13'
windows_image = 'mcr.microsoft.com/windows:1809'
dockerize_version = '0.6.1'
wix_image = 'grafana/ci-wix:0.1.1'