mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
PluginCiE2E: Upgrade base images (#30696)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
parent
8744ad361b
commit
52a8f2bf7e
@ -1,6 +1,5 @@
|
||||
FROM debian:buster-slim
|
||||
FROM debian:testing-20210111-slim
|
||||
|
||||
USER root
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
COPY scripts scripts
|
||||
|
@ -5,5 +5,5 @@
|
||||
##
|
||||
|
||||
DOCKER_IMAGE_BASE_NAME="grafana/grafana-plugin-ci-e2e"
|
||||
DOCKER_IMAGE_VERSION="1.0.2"
|
||||
DOCKER_IMAGE_VERSION="1.1.0"
|
||||
DOCKER_IMAGE_NAME="${DOCKER_IMAGE_BASE_NAME}:${DOCKER_IMAGE_VERSION}"
|
||||
|
@ -22,16 +22,16 @@ source "/etc/profile"
|
||||
npm i -g yarn
|
||||
|
||||
# Install Go
|
||||
filename="go1.15.1.linux-amd64.tar.gz"
|
||||
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "70ac0dbf60a8ee9236f337ed0daa7a4c3b98f6186d4497826f68e97c0c0413f6"
|
||||
filename="go1.15.7.linux-amd64.tar.gz"
|
||||
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "0d142143794721bb63ce6c8a6180c4062bcf8ef4715e7d6d6609f3a8282629b3"
|
||||
untar_file "/tmp/$filename"
|
||||
|
||||
# Install golangci-lint
|
||||
GOLANGCILINT_VERSION=1.31.0
|
||||
GOLANGCILINT_VERSION=1.36.0
|
||||
filename="golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64"
|
||||
get_file "https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCILINT_VERSION}/$filename.tar.gz" \
|
||||
"/tmp/$filename.tar.gz" \
|
||||
"9a5d47b51442d68b718af4c7350f4406cdc087e2236a5b9ae52f37aebede6cb3"
|
||||
"9b8856b3a1c9bfbcf3a06b78e94611763b79abd9751c245246787cd3bf0e78a5"
|
||||
untar_file "/tmp/$filename.tar.gz"
|
||||
ln -s /usr/local/${filename}/golangci-lint /usr/local/bin/golangci-lint
|
||||
ln -s /usr/local/go/bin/go /usr/local/bin/go
|
||||
|
@ -9,7 +9,7 @@ services:
|
||||
- ${HOME}/.ssh:/root/.ssh
|
||||
- ../../..:/root/grafana-toolkit
|
||||
cibuilt:
|
||||
image: "srclosson/grafana-plugin-ci-e2e"
|
||||
image: "grafana/grafana-plugin-ci-e2e"
|
||||
user: root
|
||||
volumes:
|
||||
- ../scripts:/root/scripts
|
||||
|
Loading…
Reference in New Issue
Block a user