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
463e8ffd
Unverified
Commit
463e8ffd
authored
Jun 30, 2020
by
Arve Knudsen
Committed by
GitHub
Jun 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Docker: Upgrade to base on Alpine 3.12 (#25936)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
parent
8e36a159
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
Dockerfile
+3
-3
packaging/docker/Dockerfile
+1
-1
packaging/docker/build.sh
+1
-1
No files found.
Dockerfile
View file @
463e8ffd
FROM
node:12.1
6.3-alpine3.11
as js-builder
FROM
node:12.1
8.1-alpine3.12
as js-builder
WORKDIR
/usr/src/app/
WORKDIR
/usr/src/app/
...
@@ -16,7 +16,7 @@ COPY emails emails
...
@@ -16,7 +16,7 @@ COPY emails emails
ENV
NODE_ENV production
ENV
NODE_ENV production
RUN
./node_modules/.bin/grunt build
RUN
./node_modules/.bin/grunt build
FROM
golang:1.14.
2-alpine3.11
as go-builder
FROM
golang:1.14.
4-alpine3.12
as go-builder
RUN
apk add
--no-cache
gcc g++
RUN
apk add
--no-cache
gcc g++
...
@@ -32,7 +32,7 @@ COPY build.go package.json ./
...
@@ -32,7 +32,7 @@ COPY build.go package.json ./
RUN
go run build.go build
RUN
go run build.go build
# Final stage
# Final stage
FROM
alpine:3.1
1
FROM
alpine:3.1
2
LABEL
maintainer="Grafana team <hello@grafana.com>"
LABEL
maintainer="Grafana team <hello@grafana.com>"
...
...
packaging/docker/Dockerfile
View file @
463e8ffd
ARG
BASE_IMAGE=alpine:3.1
1
ARG
BASE_IMAGE=alpine:3.1
2
FROM
${BASE_IMAGE}
FROM
${BASE_IMAGE}
ARG
GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"
ARG
GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"
...
...
packaging/docker/build.sh
View file @
463e8ffd
...
@@ -60,7 +60,7 @@ docker_build () {
...
@@ -60,7 +60,7 @@ docker_build () {
if
[
$UBUNTU_BASE
=
"0"
]
;
then
if
[
$UBUNTU_BASE
=
"0"
]
;
then
libc
=
"-musl"
libc
=
"-musl"
dockerfile
=
"Dockerfile"
dockerfile
=
"Dockerfile"
base_image
=
"
${
base_arch
}
alpine:3.1
1
"
base_image
=
"
${
base_arch
}
alpine:3.1
2
"
else
else
libc
=
""
libc
=
""
dockerfile
=
"ubuntu.Dockerfile"
dockerfile
=
"ubuntu.Dockerfile"
...
...
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