public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions 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
scripts/build/ci-build-windows/Dockerfile
+3 -3
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 .
scripts/build/ci-build/Dockerfile
+7 -8
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
scripts/build/ci-deploy/Dockerfile
+2 -2
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 \