Commit 87633c56 by Arve Knudsen Committed by GitHub

Chore: Upgrade Docker build image wrt. Go/golangci-lint/Node (#30077)

* ci-build: Upgrade base image, Go, Node, golangci-lint

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Upgrade build image

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Upgrade plugin build image

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent 7ff37bc6
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
## Common variable declarations ## Common variable declarations
## ##
DOCKER_IMAGE_NAME="grafana/grafana-plugin-ci:1.1.0-alpine" DOCKER_IMAGE_NAME="grafana/grafana-plugin-ci:1.1.1-alpine"
...@@ -18,16 +18,16 @@ apk add --no-cache curl nodejs npm yarn build-base openssh git-lfs perl-utils co ...@@ -18,16 +18,16 @@ apk add --no-cache curl nodejs npm yarn build-base openssh git-lfs perl-utils co
# 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 # 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 # Install Go
filename="go1.15.3.linux-amd64.tar.gz" filename="go1.15.6.linux-amd64.tar.gz"
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "010a88df924a81ec21b293b5da8f9b11c176d27c0ee3962dc1738d2352d3c02d" get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "3918e6cc85e7eaaa6f859f1bdbaac772e7a825b0eb423c63d3ae68b21f84b844"
untar_file "/tmp/$filename" untar_file "/tmp/$filename"
# Install golangci-lint # Install golangci-lint
GOLANGCILINT_VERSION=1.32.2 GOLANGCILINT_VERSION=1.34.1
filename="golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64" filename="golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64"
get_file "https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/$filename.tar.gz" \ get_file "https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/$filename.tar.gz" \
"/tmp/${filename}.tar.gz" \ "/tmp/${filename}.tar.gz" \
"e7ab86d833bf9faed39801ab3b5cd294f026d26f9a7da63a42390943ead486cc" "23e4a9d8f89729007c6d749c245f725c2dbcfb194f4099003f9b826f1d386ad1"
untar_file "/tmp/${filename}.tar.gz" untar_file "/tmp/${filename}.tar.gz"
ln -s /usr/local/${filename}/golangci-lint /usr/local/bin/golangci-lint ln -s /usr/local/${filename}/golangci-lint /usr/local/bin/golangci-lint
ln -s /usr/local/go/bin/go /usr/local/bin/go ln -s /usr/local/go/bin/go /usr/local/bin/go
......
# Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's. # Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
FROM debian:stretch-20201012-slim AS toolchain FROM debian:stretch-20201209 AS toolchain
ENV OSX_MIN=10.10 \ ENV OSX_MIN=10.10 \
CTNG=1.24.0 \ CTNG=1.24.0 \
...@@ -73,8 +73,8 @@ RUN cd /tmp && \ ...@@ -73,8 +73,8 @@ RUN cd /tmp && \
rm -rf /tmp/x86_64-centos6-linux-gnu/ && \ rm -rf /tmp/x86_64-centos6-linux-gnu/ && \
rm -rf /tmp/crosstool-ng-${CTNG} rm -rf /tmp/crosstool-ng-${CTNG}
ARG GOLANGCILINT_VERSION=1.33.0 ARG GOLANGCILINT_VERSION=1.34.1
ARG GOLANGCILINT_CHKSUM=e2d6082f1df53c5d2c280765000f9e82783ea909ba419c6c4e172936b076031e ARG GOLANGCILINT_CHKSUM=23e4a9d8f89729007c6d749c245f725c2dbcfb194f4099003f9b826f1d386ad1
RUN curl -fLO https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz 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 RUN echo ${GOLANGCILINT_CHKSUM} golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64.tar.gz | sha256sum --check --strict --status
...@@ -95,12 +95,12 @@ RUN tar xf cue_${CUE_VERSION}_Linux_x86_64.tar.gz -C /tmp cue ...@@ -95,12 +95,12 @@ RUN tar xf cue_${CUE_VERSION}_Linux_x86_64.tar.gz -C /tmp cue
# Base image to crossbuild grafana. # Base image to crossbuild grafana.
# Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's. # Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
FROM debian:stretch-20201012 FROM debian:stretch-20201209
ENV GOVERSION=1.15.5 \ ENV GOVERSION=1.15.6 \
PATH=/usr/local/go/bin:$PATH \ PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \ GOPATH=/go \
NODEVERSION=14.15.1-1nodesource1 \ NODEVERSION=14.15.4-1nodesource1 \
YARNVERSION=1.22.5-1 \ YARNVERSION=1.22.5-1 \
GO111MODULE=on GO111MODULE=on
......
#!/bin/bash #!/bin/bash
set -eo pipefail set -eo pipefail
_version="1.3.0" _version="1.3.1"
_tag="grafana/build-container:${_version}" _tag="grafana/build-container:${_version}"
_dpath=$(dirname "${BASH_SOURCE[0]}") _dpath=$(dirname "${BASH_SOURCE[0]}")
......
grabpl_version = '0.5.31' grabpl_version = '0.5.31'
build_image = 'grafana/build-container:1.3.0' build_image = 'grafana/build-container:1.3.1'
publish_image = 'grafana/grafana-ci-deploy:1.2.7' publish_image = 'grafana/grafana-ci-deploy:1.2.7'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
alpine_image = 'alpine:3.12' alpine_image = 'alpine:3.12'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment