IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-24 15:27:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update scripts and Dockerfiles to use Go 1.16.1 (#31881)

Browse Source 
* Update scripts and Dockerfiles to use Go 1.16.1

* Update build-container image version to 1.4.1

* Update node version to 14.16.0-1nodesource1

* Updated drone configuration
This commit is contained in:
Dimitris Sotirakis 2021-03-11 12:55:04 +02:00 committed by GitHub
parent 0179d23af0
commit d59574ec1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 175 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

322
.drone.yml
View File

File diff suppressed because it is too large Load Diff

2
Dockerfile
View File

@ -16,7 +16,7 @@ COPY emails emails
ENV NODE_ENV production
RUN yarn build
FROM golang:1.16.0-alpine3.13 as go-builder
FROM golang:1.16.1-alpine3.13 as go-builder
RUN apk add --no-cache gcc g++

4
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh
View File

@ -18,8 +18,8 @@ apk add --no-cache curl 'nodejs-current=14.5.0-r0' npm yarn build-base openssh g
# apk add --no-cache xvfb glib nss nspr gdk-pixbuf "gtk+3.0" pango atk cairo dbus-libs libxcomposite libxrender libxi libxtst libxrandr libxscrnsaver alsa-lib at-spi2-atk at-spi2-core cups-libs gcompat libc6-compat
# Install Go
filename="go1.16.linux-amd64.tar.gz"
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"
filename="go1.16.1.linux-amd64.tar.gz"
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "3edc22f8332231c3ba8be246f184b736b8d28f06ce24f08168d8ecf052549769"
untar_file "/tmp/$filename"
# Install golangci-lint

4
packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
View File

@ -22,8 +22,8 @@ source "/etc/profile"
npm i -g yarn
# Install Go
filename="go1.16.linux-amd64.tar.gz"
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"
filename="go1.16.1.linux-amd64.tar.gz"
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "3edc22f8332231c3ba8be246f184b736b8d28f06ce24f08168d8ecf052549769"
untar_file "/tmp/$filename"
# Install golangci-lint

4
packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
View File

@ -2,8 +2,8 @@
source "./deploy-common.sh"
# Install Go
filename="go1.16.linux-amd64.tar.gz"
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"
filename="go1.16.1.linux-amd64.tar.gz"
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "3edc22f8332231c3ba8be246f184b736b8d28f06ce24f08168d8ecf052549769"
untar_file "/tmp/$filename"
# Install golangci-lint

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.16 unzip@6.00 gcc@9.3.0-2
RUN powershell -Command scoop install go@1.16.1 unzip@6.00 gcc@9.3.0-2
# Install diffutils, in case we need them
RUN powershell (New-Object Net.WebClient).DownloadFile(\

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

@ -100,10 +100,10 @@ RUN tar xf cue_${CUE_VERSION}_Linux_x86_64.tar.gz -C /tmp cue
# Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
FROM debian:stretch-20210208
ENV GOVERSION=1.16 \
ENV GOVERSION=1.16.1 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=14.15.5-1nodesource1 \
NODEVERSION=14.16.0-1nodesource1 \
YARNVERSION=1.22.5-1
# Use ARG so as not to persist environment variable in image

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

@ -1,7 +1,7 @@
#!/bin/bash
set -eo pipefail
_version="1.4.0"
_version="1.4.1"
_tag="grafana/build-container:${_version}"
_dpath=$(dirname "${BASH_SOURCE[0]}")

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.16 \
GO_CHECKSUM=013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 \
ARG GOVERSION=1.16.1 \
GO_CHECKSUM=3edc22f8332231c3ba8be246f184b736b8d28f06ce24f08168d8ecf052549769 \
DEBIAN_FRONTEND=noninteractive
ENV PATH=/usr/local/go/bin:$PATH \

2
scripts/lib.star
View File

@ -1,5 +1,5 @@
grabpl_version = '0.5.43'
build_image = 'grafana/build-container:1.4.0'
build_image = 'grafana/build-container:1.4.1'
publish_image = 'grafana/grafana-ci-deploy:1.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
alpine_image = 'alpine:3.13'