Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
8954130f
Unverified
Commit
8954130f
authored
Nov 03, 2020
by
Arve Knudsen
Committed by
GitHub
Nov 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Plugin Dockerfiles: Upgrade Go, golangci-lint, gcloud SDK (#28767)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent
b35d4e1e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/common.sh
+1
-1
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh
+6
-6
packages/grafana-toolkit/docker/grafana-plugin-ci/common.sh
+1
-1
packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
+6
-6
No files found.
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/common.sh
View file @
8954130f
...
...
@@ -4,4 +4,4 @@
## Common variable declarations
##
DOCKER_IMAGE_NAME
=
"grafana/grafana-plugin-ci:1.
0.1
-alpine"
DOCKER_IMAGE_NAME
=
"grafana/grafana-plugin-ci:1.
1.0
-alpine"
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh
View file @
8954130f
...
...
@@ -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
# Install Go
filename
=
"go1.15.
1
.linux-amd64.tar.gz"
get_file
"https://dl.google.com/go/
$filename
"
"/tmp/
$filename
"
"
70ac0dbf60a8ee9236f337ed0daa7a4c3b98f6186d4497826f68e97c0c0413f6
"
filename
=
"go1.15.
3
.linux-amd64.tar.gz"
get_file
"https://dl.google.com/go/
$filename
"
"/tmp/
$filename
"
"
010a88df924a81ec21b293b5da8f9b11c176d27c0ee3962dc1738d2352d3c02d
"
untar_file
"/tmp/
$filename
"
# Install golangci-lint
GOLANGCILINT_VERSION
=
1.3
1.0
GOLANGCILINT_VERSION
=
1.3
2.2
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
"
"
e7ab86d833bf9faed39801ab3b5cd294f026d26f9a7da63a42390943ead486cc
"
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
...
...
@@ -65,8 +65,8 @@ current_dir=$PWD
cd
/usr/local/grafana-toolkit
&&
yarn install
&&
cd
$current_dir
ln
-s
/usr/local/grafana-toolkit/bin/grafana-toolkit.js /usr/local/bin/grafana-toolkit
GOOGLE_SDK_VERSION
=
3
08
.0.0
GOOGLE_SDK_CHECKSUM
=
9
e8e31d9503340fc912374311ac1fffbfc5b59748d20b681f9aca3de2b68deb5
GOOGLE_SDK_VERSION
=
3
16
.0.0
GOOGLE_SDK_CHECKSUM
=
9
6a0b75474dbfa9f3d46dcdec7a4d68a664cb7d57fade5710fe88b1fdf6babb3
curl
-fLO
https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-
${
GOOGLE_SDK_VERSION
}
-linux-x86_64
.tar.gz
echo
"
${
GOOGLE_SDK_CHECKSUM
}
google-cloud-sdk-
${
GOOGLE_SDK_VERSION
}
-linux-x86_64.tar.gz"
| sha256sum
--check
--status
...
...
packages/grafana-toolkit/docker/grafana-plugin-ci/common.sh
View file @
8954130f
...
...
@@ -4,4 +4,4 @@
## Common variable declarations
##
DOCKER_IMAGE_NAME
=
"grafana/grafana-plugin-ci:1.
0
.0"
DOCKER_IMAGE_NAME
=
"grafana/grafana-plugin-ci:1.
1
.0"
packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
View file @
8954130f
...
...
@@ -2,16 +2,16 @@
source
"./deploy-common.sh"
# Install Go
filename
=
"go1.15.
1
.linux-amd64.tar.gz"
get_file
"https://dl.google.com/go/
$filename
"
"/tmp/
$filename
"
"
70ac0dbf60a8ee9236f337ed0daa7a4c3b98f6186d4497826f68e97c0c0413f6
"
filename
=
"go1.15.
3
.linux-amd64.tar.gz"
get_file
"https://dl.google.com/go/
$filename
"
"/tmp/
$filename
"
"
010a88df924a81ec21b293b5da8f9b11c176d27c0ee3962dc1738d2352d3c02d
"
untar_file
"/tmp/
$filename
"
# Install golangci-lint
GOLANGCILINT_VERSION
=
1.3
1.0
GOLANGCILINT_VERSION
=
1.3
2.2
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
"
"
e7ab86d833bf9faed39801ab3b5cd294f026d26f9a7da63a42390943ead486cc
"
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
...
...
@@ -36,8 +36,8 @@ git clone https://github.com/magefile/mage.git /tmp/mage
pushd
/tmp/mage
&&
go run bootstrap.go
&&
popd
mv
$HOME
/go/bin/mage /usr/local/bin
GOOGLE_SDK_VERSION
=
3
08
.0.0
GOOGLE_SDK_CHECKSUM
=
9
e8e31d9503340fc912374311ac1fffbfc5b59748d20b681f9aca3de2b68deb5
GOOGLE_SDK_VERSION
=
3
16
.0.0
GOOGLE_SDK_CHECKSUM
=
9
6a0b75474dbfa9f3d46dcdec7a4d68a664cb7d57fade5710fe88b1fdf6babb3
curl
-fLO
https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-
${
GOOGLE_SDK_VERSION
}
-linux-x86_64
.tar.gz
echo
"
${
GOOGLE_SDK_CHECKSUM
}
google-cloud-sdk-
${
GOOGLE_SDK_VERSION
}
-linux-x86_64.tar.gz"
| sha256sum
--check
--status
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment