Skip to content

Commit

Permalink
Update scripts and Dockerfiles to use Go 1.16.1 (grafana#31881)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
dsotirakis authored Mar 11, 2021
1 parent 0179d23 commit d59574e
Show file tree
Hide file tree
Showing 10 changed files with 175 additions and 175 deletions.
322 changes: 161 additions & 161 deletions .drone.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/ci-build-windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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(\
Expand Down
4 changes: 2 additions & 2 deletions scripts/build/ci-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/ci-build/build-deploy.sh
Original file line number Diff line number Diff line change
@@ -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]}")
Expand Down
4 changes: 2 additions & 2 deletions scripts/build/ci-deploy/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion scripts/lib.star
Original file line number Diff line number Diff line change
@@ -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'
Expand Down

0 comments on commit d59574e

Please sign in to comment.