Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Docker: Switch base image to ubuntu:latest from debian:stretch to avoid security issues. #17066

Merged
merged 5 commits into from Jun 14, 2019
Merged

Docker: Switch base image to ubuntu:latest from debian:stretch to avoid security issues. #17066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b503703
docker: switch from debian stretch to buster
bergquist May 14, 2019
2e4ad54
disable fast build for this pr
bergquist May 14, 2019
657fa69
disable fast mode for build during development
bergquist May 14, 2019
ef3b481
docker: switch from debian:buster to ubuntu:latest
bergquist May 22, 2019
1098611
disable arm builds for PRs
bergquist May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Expand Up @@ -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>"

Expand Down
4 changes: 2 additions & 2 deletions packaging/docker/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=debian:stretch-slim
ARG BASE_IMAGE=ubuntu:latest
FROM ${BASE_IMAGE}

ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions packaging/docker/build.sh
View file
Open in desktop
Expand Up @@ -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
Expand Down