diff --git a/.circleci/config.yml b/.circleci/config.yml index 21e50a3fb7d..c676d531c32 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,7 @@ commands: - run: name: "Install Grafana build pipeline tool" command: | - VERSION=0.2.10 + VERSION=0.2.11 curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${VERSION}/grabpl chmod +x grabpl mv grabpl /tmp diff --git a/CHANGELOG.md b/CHANGELOG.md index 53101d73388..e3498a00ec3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Breaking changes - **Removed PhantomJS**: PhantomJS was deprecated in [Grafana v6.4](https://grafana.com/docs/grafana/latest/guides/whats-new-in-v6-4/#phantomjs-deprecation) and starting from Grafana v7.0.0, all PhantomJS support has been removed. This means that Grafana no longer ships with a built-in image renderer, and we advise you to install the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer). +- **Docker**: Our Ubuntu based images have been upgraded to Ubuntu [20.04 LTS](https://releases.ubuntu.com/20.04/). # 6.7.3 (2020-04-23) diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 3d2ae762620..a77c158cfd8 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -30,7 +30,7 @@ COPY emails emails ENV NODE_ENV production RUN ./node_modules/.bin/grunt build -FROM ubuntu:19.10 +FROM ubuntu:20.04 LABEL maintainer="Grafana team " EXPOSE 3000 diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh index 5312ae7e49d..956cba20c8b 100755 --- a/packaging/docker/build.sh +++ b/packaging/docker/build.sh @@ -64,7 +64,7 @@ docker_build () { else libc="" dockerfile="ubuntu.Dockerfile" - base_image="${base_arch}ubuntu:19.10" + base_image="${base_arch}ubuntu:20.04" fi grafana_tgz="grafana-latest.linux-${arch}${libc}.tar.gz" diff --git a/packaging/docker/ubuntu.Dockerfile b/packaging/docker/ubuntu.Dockerfile index 9c4bd45396d..d61b0cd9d6b 100644 --- a/packaging/docker/ubuntu.Dockerfile +++ b/packaging/docker/ubuntu.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=ubuntu:19.10 +ARG BASE_IMAGE=ubuntu:20.04 FROM ${BASE_IMAGE} AS grafana-builder ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz" diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index 69b10687482..aed244230af 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 as toolchain +FROM ubuntu:20.04 as toolchain ENV OSX_SDK_URL=https://s3.dockerproject.org/darwin/v2 \ OSX_SDK=MacOSX10.10.sdk \ @@ -70,7 +70,7 @@ RUN cd /tmp && \ rm -rf /tmp/crosstool-ng-${CTNG} # base image to crossbuild grafana -FROM ubuntu:18.04 +FROM ubuntu:20.04 ENV GOVERSION=1.14.1 \ PATH=/usr/local/go/bin:$PATH \