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
702fb1ed
Unverified
Commit
702fb1ed
authored
Sep 29, 2020
by
Arve Knudsen
Committed by
GitHub
Sep 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drone: Upgrade drone-grafana-docker image (#27911)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent
d745a66a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
.drone.yml
+3
-3
packaging/docker/Dockerfile
+4
-1
packaging/docker/ubuntu.Dockerfile
+1
-1
scripts/lib.star
+1
-1
No files found.
.drone.yml
View file @
702fb1ed
...
...
@@ -160,7 +160,7 @@ steps:
-
package
-
name
:
build-docker-images
image
:
grafana/drone-grafana-docker:0.3.
1
image
:
grafana/drone-grafana-docker:0.3.
2
settings
:
archs
:
amd64
dry_run
:
true
...
...
@@ -455,7 +455,7 @@ steps:
-
package
-
name
:
build-docker-images
image
:
grafana/drone-grafana-docker:0.3.
1
image
:
grafana/drone-grafana-docker:0.3.
2
settings
:
edition
:
oss
password
:
...
...
@@ -466,7 +466,7 @@ steps:
-
copy-packages-for-docker
-
name
:
build-docker-images-ubuntu
image
:
grafana/drone-grafana-docker:0.3.
1
image
:
grafana/drone-grafana-docker:0.3.
2
settings
:
edition
:
oss
password
:
...
...
packaging/docker/Dockerfile
View file @
702fb1ed
...
...
@@ -3,10 +3,13 @@ FROM ${BASE_IMAGE}
ARG
GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"
# Make sure we have Gnu tar
RUN
apk add
--no-cache
tar
COPY
${GRAFANA_TGZ} /tmp/grafana.tar.gz
# Change to tar xfzv to make tar print every file it extracts
RUN
mkdir /tmp/grafana
&&
tar
x
fz
/tmp/grafana.tar.gz
--strip-components
=
1
-C
/tmp/grafana
RUN
mkdir /tmp/grafana
&&
tar
x
zf
/tmp/grafana.tar.gz
--strip-components
=
1
-C
/tmp/grafana
FROM
${BASE_IMAGE}
...
...
packaging/docker/ubuntu.Dockerfile
View file @
702fb1ed
...
...
@@ -5,7 +5,7 @@ ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"
COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
RUN mkdir /tmp/grafana && tar x
fz
/tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
RUN mkdir /tmp/grafana && tar x
zf
/tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
FROM ${BASE_IMAGE}
...
...
scripts/lib.star
View file @
702fb1ed
build_image = 'grafana/build-container:1.2.27'
publish_image = 'grafana/grafana-ci-deploy:1.2.6'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.
1
'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.
2
'
alpine_image = 'alpine:3.12'
windows_image = 'mcr.microsoft.com/windows:1809'
grabpl_version = '0.5.13'
...
...
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