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
f9b691bd
Unverified
Commit
f9b691bd
authored
Jun 14, 2019
by
Carl Bergquist
Committed by
GitHub
Jun 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Docker: Switch base to ubuntu:latest (#17066)
parent
c853ef73
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
Dockerfile
+1
-1
packaging/docker/Dockerfile
+2
-2
packaging/docker/build.sh
+3
-3
No files found.
Dockerfile
View file @
f9b691bd
...
...
@@ -33,7 +33,7 @@ ENV NODE_ENV production
RUN
./node_modules/.bin/grunt build
# Final container
FROM
debian:stretch-slim
FROM
ubuntu:latest
LABEL
maintainer="Grafana team <hello@grafana.com>"
...
...
packaging/docker/Dockerfile
View file @
f9b691bd
ARG
BASE_IMAGE=
debian:stretch-slim
ARG
BASE_IMAGE=
ubuntu:latest
FROM
${BASE_IMAGE}
ARG
GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"
...
...
@@ -12,7 +12,7 @@ COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
# Change to tar xfzv to make tar print every file it extracts
RUN
mkdir /tmp/grafana
&&
tar
xfz /tmp/grafana.tar.gz
--strip-components
=
1
-C
/tmp/grafana
ARG
BASE_IMAGE=
debian:stretch-slim
ARG
BASE_IMAGE=
ubuntu:latest
FROM
${BASE_IMAGE}
ARG
GF_UID="472"
...
...
packaging/docker/build.sh
View file @
f9b691bd
...
...
@@ -59,10 +59,10 @@ docker_tag_all () {
fi
}
docker_build
"
debian:stretch-slim
"
"grafana-latest.linux-x64.tar.gz"
"
${
_docker_repo
}
:
${
_grafana_version
}
"
docker_build
"
ubuntu:latest
"
"grafana-latest.linux-x64.tar.gz"
"
${
_docker_repo
}
:
${
_grafana_version
}
"
if
[
$BUILD_FAST
=
"0"
]
;
then
docker_build
"arm32v7/
debian:stretch-slim
"
"grafana-latest.linux-armv7.tar.gz"
"
${
_docker_repo
}
-arm32v7-linux:
${
_grafana_version
}
"
docker_build
"arm64v8/
debian:stretch-slim
"
"grafana-latest.linux-arm64.tar.gz"
"
${
_docker_repo
}
-arm64v8-linux:
${
_grafana_version
}
"
docker_build
"arm32v7/
ubuntu:latest
"
"grafana-latest.linux-armv7.tar.gz"
"
${
_docker_repo
}
-arm32v7-linux:
${
_grafana_version
}
"
docker_build
"arm64v8/
ubuntu:latest
"
"grafana-latest.linux-arm64.tar.gz"
"
${
_docker_repo
}
-arm64v8-linux:
${
_grafana_version
}
"
fi
# Tag as 'latest' for official release; otherwise tag as grafana/grafana:master
if
echo
"
$_grafana_tag
"
|
grep
-q
"^v"
;
then
...
...
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