IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-26 16:27:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Docker: Upgrade Ubuntu to 19.10 (#22306)

Browse Source
This commit is contained in:
Arve Knudsen 2020-02-19 15:23:54 +01:00 committed by GitHub
parent 7bf3f0b9c1
commit b148b306e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.ubuntu
View File

@ -27,14 +27,14 @@ COPY packages packages
RUN yarn install --pure-lockfile
COPY Gruntfile.js tsconfig.json .eslintrc .browserslistrc ./
COPY public public
COPY public public
COPY scripts scripts
COPY emails emails
ENV NODE_ENV production
RUN ./node_modules/.bin/grunt build
FROM ubuntu:18.10
FROM ubuntu:19.10
LABEL maintainer="Grafana team <hello@grafana.com>"
EXPOSE 3000

2
packaging/docker/build.sh
View File

@ -64,7 +64,7 @@ docker_build () {
else
libc=""
dockerfile="ubuntu.Dockerfile"
base_image="${base_arch}ubuntu:18.10"
base_image="${base_arch}ubuntu:19.10"
fi
grafana_tgz="grafana-latest.linux-${arch}${libc}.tar.gz"

2
packaging/docker/ubuntu.Dockerfile
View File

@ -1,4 +1,4 @@
ARG BASE_IMAGE=ubuntu:18.10
ARG BASE_IMAGE=ubuntu:19.10
FROM ${BASE_IMAGE} AS grafana-builder
ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"