Build: Streamline and sync dockerfiles (#58101)

* streamline and sync dockerfiles * improve go dependency cacheability * unify alpine and ubuntu Dockerfiles * include glibc support in locally-built alpine images
2025-02-25 18:55:37 -06:00 · 2022-11-28 14:43:42 -05:00
parent 84ec35a4ad
commit 9fec54df2d
12 changed files with 270 additions and 346 deletions
--- a/.github/pr-commands.json
+++ b/.github/pr-commands.json
@@ -67,7 +67,6 @@
      "scripts/*.sh",
      "Makefile",
      "Dockerfile",
-      "Dockerfile.ubuntu"
    ],
    "action": "updateLabel",
    "addLabel": "type/build-packaging"
--- a/101
+++ b/101
@@ -1,8 +1,21 @@
-FROM node:16-alpine3.15 as js-builder
+######################## IMPORTANT ########################
+#
+# There are 2 Dockerfiles which must be kept in sync:
+#
+# - Dockerfile
+# - packaging/docker/Dockerfile
+#
+###########################################################
+
+ARG BASE_IMAGE=alpine:3.15
+ARG JS_IMAGE=node:16-alpine3.15
+ARG GO_IMAGE=golang:1.19.3-alpine3.15
+
+FROM ${JS_IMAGE} as js-builder

 ENV NODE_OPTIONS=--max_old_space_size=8000

-WORKDIR /grafana
+WORKDIR /tmp/grafana

 COPY package.json yarn.lock .yarnrc.yml ./
 COPY .yarn .yarn
@@ -13,35 +26,43 @@ RUN yarn install

 COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json .linguirc ./
 COPY public public
-COPY tools tools
 COPY scripts scripts
 COPY emails emails

 ENV NODE_ENV production
 RUN yarn build

-FROM golang:1.19.3-alpine3.15 as go-builder
+FROM ${GO_IMAGE} as go-builder

-RUN apk add --no-cache gcc g++ make
+# Install build dependencies
+RUN if grep -i -q alpine /etc/issue; then \
+      apk add --no-cache gcc g++ make; \
+    fi

-WORKDIR /grafana
+WORKDIR /tmp/grafana

-COPY go.mod go.sum embed.go Makefile build.go package.json ./
+COPY go.* ./
+COPY .bingo .bingo
+
+RUN go mod download && \
+    go install github.com/bwplotka/bingo@latest && \
+    bingo get
+
+COPY embed.go Makefile build.go package.json ./
+COPY cue.mod cue.mod
+COPY kinds kinds
 COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
 COPY public/api-spec.json public/api-spec.json
 COPY pkg pkg
 COPY scripts scripts
-COPY cue.mod cue.mod
-COPY .bingo .bingo

-RUN go mod verify
 RUN make build-go

 # Final stage
-FROM alpine:3.15.6
+FROM ${BASE_IMAGE}

-LABEL maintainer="Grafana team <hello@grafana.com>"
+LABEL maintainer="Grafana Labs <hello@grafana.com>"

 ARG GF_UID="472"
 ARG GF_GID="0"
@@ -56,18 +77,51 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \

 WORKDIR $GF_PATHS_HOME

-RUN apk add --no-cache ca-certificates bash tzdata musl-utils
-RUN apk info -vv | sort
+# Install dependencies
+RUN if grep -i -q alpine /etc/issue; then \
+      apk add --no-cache ca-certificates bash tzdata musl-utils && \
+      apk info -vv | sort; \
+    elif grep -i -q ubuntu /etc/issue; then \
+      DEBIAN_FRONTEND=noninteractive && \
+      apt-get update && \
+      apt-get install -y ca-certificates curl tzdata && \
+      apt-get autoremove -y && \
+      rm -rf /var/lib/apt/lists/*; \
+    else \
+      echo 'ERROR: Unsupported base image' && /bin/false; \
+    fi
+
+# glibc support for alpine x86_64 only
+RUN if grep -i -q alpine /etc/issue && [ `arch` = "x86_64" ]; then \
+      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \
+        -O /tmp/glibc-2.35-r0.apk && \
+      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \
+        -O /tmp/glibc-bin-2.35-r0.apk && \
+      apk add --no-cache --allow-untrusted /tmp/glibc-2.35-r0.apk /tmp/glibc-bin-2.35-r0.apk && \
+      rm -f /lib64/ld-linux-x86-64.so.2 && \
+      ln -s /usr/glibc-compat/lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 && \
+      rm -f /tmp/glibc-2.35-r0.apk && \
+      rm -f /tmp/glibc-bin-2.35-r0.apk && \
+      rm -f /lib/ld-linux-x86-64.so.2 && \
+      rm -f /etc/ld.so.cache; \
+    fi

 COPY conf ./conf

 RUN if [ ! $(getent group "$GF_GID") ]; then \
+      if grep -i -q alpine /etc/issue; then \
        addgroup -S -g $GF_GID grafana; \
-  fi
-
-RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
+      else \
+        addgroup --system --gid $GF_GID grafana; \
+      fi; \
+    fi && \
+    GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
    mkdir -p "$GF_PATHS_HOME/.aws" && \
-  adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana && \
+    if grep -i -q alpine /etc/issue; then \
+      adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana; \
+    else \
+      adduser --system --uid $GF_UID --ingroup "$GF_GID_NAME" grafana; \
+    fi && \
    mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
             "$GF_PATHS_PROVISIONING/dashboards" \
             "$GF_PATHS_PROVISIONING/notifiers" \
@@ -77,18 +131,17 @@ RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
             "$GF_PATHS_LOGS" \
             "$GF_PATHS_PLUGINS" \
             "$GF_PATHS_DATA" && \
-  cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
-  cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
+    cp conf/sample.ini "$GF_PATHS_CONFIG" && \
+    cp conf/ldap.toml /etc/grafana/ldap.toml && \
    chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"

-COPY --from=go-builder /grafana/bin/*/grafana-server /grafana/bin/*/grafana-cli /grafana/bin/*/grafana ./bin/
-COPY --from=js-builder /grafana/public ./public
-COPY --from=js-builder /grafana/tools ./tools
+COPY --from=go-builder /tmp/grafana/bin/*/grafana-server /tmp/grafana/bin/*/grafana-cli /tmp/grafana/bin/*/grafana ./bin/
+COPY --from=js-builder /tmp/grafana/public ./public

 EXPOSE 3000

 COPY ./packaging/docker/run.sh /run.sh

-USER grafana
+USER "$GF_UID"
 ENTRYPOINT [ "/run.sh" ]
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,87 +0,0 @@
-FROM node:16-alpine3.15 as js-builder
-
-ENV NODE_OPTIONS=--max_old_space_size=8000
-
-WORKDIR /usr/src/app/
-
-COPY package.json yarn.lock ./
-COPY packages packages
-COPY .yarnrc.yml ./
-COPY .yarn .yarn
-COPY plugins-bundled plugins-bundled
-
-RUN yarn install
-
-COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json .linguirc ./
-COPY public public
-COPY tools tools
-COPY scripts scripts
-COPY emails emails
-
-ENV NODE_ENV production
-RUN yarn build
-
-FROM golang:1.19.3 AS go-builder
-
-WORKDIR /src/grafana
-
-COPY go.mod go.sum embed.go ./
-COPY Makefile build.go package.json ./
-COPY .bingo .bingo
-COPY pkg pkg/
-COPY cue.mod cue.mod/
-COPY packages/grafana-schema packages/grafana-schema/
-COPY public/app/plugins public/app/plugins/
-COPY public/api-spec.json public/api-spec.json
-
-RUN go mod verify
-RUN make build-go
-
-FROM ubuntu:20.04
-
-LABEL maintainer="Grafana team <hello@grafana.com>"
-EXPOSE 3000
-
-ARG GF_UID="472"
-ARG GF_GID="472"
-
-ENV PATH="/usr/share/grafana/bin:$PATH" \
-    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
-    GF_PATHS_DATA="/var/lib/grafana" \
-    GF_PATHS_HOME="/usr/share/grafana" \
-    GF_PATHS_LOGS="/var/log/grafana" \
-    GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
-    GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
-
-WORKDIR $GF_PATHS_HOME
-
-COPY conf conf
-
-# curl should be part of the image
-RUN apt-get update && apt-get install -y ca-certificates curl
-
-RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
-  addgroup --system --gid $GF_GID grafana && \
-  adduser --uid $GF_UID --system --ingroup grafana grafana && \
-  mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
-             "$GF_PATHS_PROVISIONING/dashboards" \
-             "$GF_PATHS_PROVISIONING/notifiers" \
-             "$GF_PATHS_PROVISIONING/plugins" \
-             "$GF_PATHS_PROVISIONING/access-control" \
-             "$GF_PATHS_PROVISIONING/alerting" \
-             "$GF_PATHS_LOGS" \
-             "$GF_PATHS_PLUGINS" \
-             "$GF_PATHS_DATA" && \
-    cp conf/sample.ini "$GF_PATHS_CONFIG" && \
-    cp conf/ldap.toml /etc/grafana/ldap.toml && \
-    chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
-
-COPY --from=go-builder /src/grafana/bin/*/grafana-server /src/grafana/bin/*/grafana-cli /grafana/bin/*/grafana bin/
-COPY --from=js-builder /usr/src/app/public public
-COPY --from=js-builder /usr/src/app/tools tools
-
-COPY packaging/docker/run.sh /
-
-USER grafana
-ENTRYPOINT [ "/run.sh" ]
--- a/9
+++ b/9
@@ -158,12 +158,15 @@ shellcheck: $(SH_FILES) ## Run checks for shell scripts.

 build-docker-full: ## Build Docker image for development.
 	@echo "build docker container"
-	docker build --tag grafana/grafana:dev .
+	docker build \
+	--tag grafana/grafana:dev .

 build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	@echo "build docker container"
-	docker build --tag grafana/grafana:dev-ubuntu -f ./Dockerfile.ubuntu .
-
+	docker build \
+	--build-arg BASE_IMAGE=ubuntu:20.04 \
+	--build-arg GO_IMAGE=golang:1.19.3 \
+	--tag grafana/grafana:dev-ubuntu .

 ##@ Services

--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -1,22 +1,39 @@
+######################## IMPORTANT ########################
+#
+# There are 2 Dockerfiles which must be kept in sync:
+#
+# - Dockerfile
+# - packaging/docker/Dockerfile
+#
+###########################################################
+
 ARG BASE_IMAGE=alpine:3.15
-FROM ${BASE_IMAGE}
+
+FROM ${BASE_IMAGE} as tgz-builder
+
+WORKDIR /tmp/grafana

 ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"

 # Make sure we have Gnu tar
-RUN apk add --no-cache tar
+RUN if grep -i -q alpine /etc/issue; then \
+      apk add --no-cache tar; \
+    fi

 COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz

 # Change to tar xfzv to make tar print every file it extracts
-RUN mkdir /tmp/grafana && tar xzf /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
+RUN tar xzf /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana

+# Final stage
 FROM ${BASE_IMAGE}

+LABEL maintainer="Grafana Labs <hello@grafana.com>"
+
 ARG GF_UID="472"
 ARG GF_GID="0"

-ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
+ENV PATH="/usr/share/grafana/bin:$PATH" \
    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
    GF_PATHS_DATA="/var/lib/grafana" \
    GF_PATHS_HOME="/usr/share/grafana" \
@@ -26,11 +43,22 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi

 WORKDIR $GF_PATHS_HOME

-RUN apk add --no-cache ca-certificates bash tzdata musl-utils
-RUN apk info -vv | sort
+# Install dependencies
+RUN if grep -i -q alpine /etc/issue; then \
+      apk add --no-cache ca-certificates bash tzdata musl-utils && \
+      apk info -vv | sort; \
+    elif grep -i -q ubuntu /etc/issue; then \
+      DEBIAN_FRONTEND=noninteractive && \
+      apt-get update && \
+      apt-get install -y ca-certificates curl tzdata && \
+      apt-get autoremove -y && \
+      rm -rf /var/lib/apt/lists/*; \
+    else \
+      echo 'ERROR: Unsupported base image' && /bin/false; \
+    fi

-# Oracle Support for x86_64 only
-RUN if [ `arch` = "x86_64" ]; then \
+# glibc support for alpine x86_64 only
+RUN if grep -i -q alpine /etc/issue && [ `arch` = "x86_64" ]; then \
      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \
        -O /tmp/glibc-2.35-r0.apk && \
      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \
@@ -44,15 +72,22 @@ RUN if [ `arch` = "x86_64" ]; then \
      rm -f /etc/ld.so.cache; \
    fi

-COPY --from=0 /tmp/grafana "$GF_PATHS_HOME"
+COPY --from=tgz-builder /tmp/grafana/conf ./conf

 RUN if [ ! $(getent group "$GF_GID") ]; then \
+      if grep -i -q alpine /etc/issue; then \
        addgroup -S -g $GF_GID grafana; \
-    fi
-
-RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
+      else \
+        addgroup --system --gid $GF_GID grafana; \
+      fi; \
+    fi && \
+    GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
    mkdir -p "$GF_PATHS_HOME/.aws" && \
-    adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana && \
+    if grep -i -q alpine /etc/issue; then \
+      adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana; \
+    else \
+      adduser --system --uid $GF_UID --ingroup "$GF_GID_NAME" grafana; \
+    fi && \
    mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
             "$GF_PATHS_PROVISIONING/dashboards" \
             "$GF_PATHS_PROVISIONING/notifiers" \
@@ -62,11 +97,14 @@ RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
             "$GF_PATHS_LOGS" \
             "$GF_PATHS_PLUGINS" \
             "$GF_PATHS_DATA" && \
-    cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
-    cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
+    cp conf/sample.ini "$GF_PATHS_CONFIG" && \
+    cp conf/ldap.toml /etc/grafana/ldap.toml && \
    chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"

+COPY --from=tgz-builder /tmp/grafana/bin/grafana-server /tmp/grafana/bin/grafana-cli ./bin/
+COPY --from=tgz-builder /tmp/grafana/public ./public
+
 EXPOSE 3000

 COPY ./run.sh /run.sh
--- a/packaging/docker/build-enterprise.sh
+++ b/packaging/docker/build-enterprise.sh
@@ -2,11 +2,13 @@
 set -e

 UBUNTU_BASE=0
+TAG_SUFFIX=""

 while [ "$1" != "" ]; do
  case "$1" in
    "--ubuntu")
      UBUNTU_BASE=1
+      TAG_SUFFIX="-ubuntu"
      echo "Ubuntu base image enabled"
      shift
      ;;
@@ -28,20 +30,11 @@ else
  _grafana_tag="${_raw_grafana_tag}"
 fi

-if [ ${UBUNTU_BASE} = "0" ]; then
-  TAG_SUFFIX=""
-  DOCKERFILE="Dockerfile"
-else
-  TAG_SUFFIX="-ubuntu"
-  DOCKERFILE="ubuntu.Dockerfile"
-fi
-
 echo "Building and deploying ${_docker_repo}:${_grafana_tag}${TAG_SUFFIX}"

 docker build \
  --tag "${_docker_repo}:${_grafana_tag}${TAG_SUFFIX}" \
  --no-cache=true \
-  -f ${DOCKERFILE} \
  .

 docker push "${_docker_repo}:${_grafana_tag}${TAG_SUFFIX}"
@@ -56,4 +49,3 @@ if echo "${_raw_grafana_tag}" | grep -q "^main-" && [ ${UBUNTU_BASE} = "1" ]; th
  docker tag "${_docker_repo}:${_grafana_tag}${TAG_SUFFIX}" "grafana/grafana-enterprise-dev:${_raw_grafana_tag}"
  docker push "grafana/grafana-enterprise-dev:${_raw_grafana_tag}"
 fi
-
--- a/packaging/docker/build.sh
+++ b/packaging/docker/build.sh
@@ -28,7 +28,7 @@ done
 _grafana_tag=${1:-}
 _docker_repo=${2:-grafana/grafana}

-# If the tag starts with v, treat this as a official release
+# If the tag starts with v, treat this as an official release
 if echo "$_grafana_tag" | grep -q "^v"; then
  _grafana_version=$(echo "${_grafana_tag}" | cut -d "v" -f 2)
 else
@@ -59,15 +59,13 @@ docker_build () {
  esac
  if [ $UBUNTU_BASE = "0" ]; then
    libc="-musl"
-    dockerfile="Dockerfile"
    base_image="${base_arch}alpine:3.15"
  else
    libc=""
-    dockerfile="ubuntu.Dockerfile"
    base_image="${base_arch}ubuntu:20.04"
  fi

-  grafana_tgz="grafana-latest.linux-${arch}${libc}.tar.gz"
+  grafana_tgz=${GRAFANA_TGZ:-"grafana-latest.linux-${arch}${libc}.tar.gz"}
  tag="${_docker_repo}${repo_arch}:${_grafana_version}${TAG_SUFFIX}"

  docker build \
@@ -75,7 +73,6 @@ docker_build () {
    --build-arg GRAFANA_TGZ=${grafana_tgz} \
    --tag "${tag}" \
    --no-cache=true \
-    -f "${dockerfile}" \
    .
 }

--- a/packaging/docker/custom/Dockerfile
+++ b/packaging/docker/custom/Dockerfile
@@ -10,14 +10,10 @@ ARG GF_GID="0"
 ENV GF_PATHS_PLUGINS="/var/lib/grafana-plugins"

 RUN mkdir -p "$GF_PATHS_PLUGINS" && \
-    chown -R grafana:${GF_GID} "$GF_PATHS_PLUGINS"
-
-RUN if [ $GF_INSTALL_IMAGE_RENDERER_PLUGIN = "true" ]; then \
-    apk --no-cache  upgrade && \
-    apk add --no-cache udev ttf-opensans chromium && \
-    rm -rf /tmp/* && \
-    rm -rf /usr/share/grafana/tools/phantomjs; \
-fi
+    chown -R grafana:${GF_GID} "$GF_PATHS_PLUGINS" && \
+    if [ $GF_INSTALL_IMAGE_RENDERER_PLUGIN = "true" ]; then \
+      apk add --no-cache udev ttf-opensans chromium \
+    fi

 USER grafana

@@ -28,7 +24,7 @@ RUN if [ $GF_INSTALL_IMAGE_RENDERER_PLUGIN = "true" ]; then \
        --pluginsDir "$GF_PATHS_PLUGINS" \
        --pluginUrl https://github.com/grafana/grafana-image-renderer/releases/latest/download/plugin-linux-x64-glibc-no-chromium.zip \
        plugins install grafana-image-renderer; \
-fi
+    fi

 ARG GF_INSTALL_PLUGINS=""

@@ -45,4 +41,4 @@ RUN if [ ! -z "${GF_INSTALL_PLUGINS}" ]; then \
          grafana-cli --pluginsDir "${GF_PATHS_PLUGINS}" plugins install ${plugin}; \
        fi \
      done \
-fi
+    fi
--- a/packaging/docker/custom/ubuntu.Dockerfile
+++ b/packaging/docker/custom/ubuntu.Dockerfile
@@ -4,27 +4,22 @@ FROM grafana/grafana:${GRAFANA_VERSION}-ubuntu

 USER root

-# Set DEBIAN_FRONTEND=noninteractive in environment at build-time
-ARG DEBIAN_FRONTEND=noninteractive
-
 ARG GF_INSTALL_IMAGE_RENDERER_PLUGIN="false"

 ARG GF_GID="0"
 ENV GF_PATHS_PLUGINS="/var/lib/grafana-plugins"

 RUN mkdir -p "$GF_PATHS_PLUGINS" && \
-    chown -R grafana:${GF_GID} "$GF_PATHS_PLUGINS"
-
-RUN if [ $GF_INSTALL_IMAGE_RENDERER_PLUGIN = "true" ]; then \
-    apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y gdebi-core && \
+    chown -R grafana:${GF_GID} "$GF_PATHS_PLUGINS" && \
+    if [ $GF_INSTALL_IMAGE_RENDERER_PLUGIN = "true" ]; then \
      cd /tmp && \
      curl -LO https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \
-    gdebi --n google-chrome-stable_current_amd64.deb && \
-    apt-get autoremove -y && \
-    rm -rf /var/lib/apt/lists/*; \
-fi
+      DEBIAN_FRONTEND=noninteractive && \
+      apt-get update && \
+      apt-get install -y ./google-chrome-stable_current_amd64.deb && \
+      rm -rf /var/lib/apt/lists/* && \
+      rm ./google-chrome-stable_current_amd64.deb \
+    fi

 USER grafana

@@ -35,7 +30,7 @@ RUN if [ $GF_INSTALL_IMAGE_RENDERER_PLUGIN = "true" ]; then \
        --pluginsDir "$GF_PATHS_PLUGINS" \
        --pluginUrl https://github.com/grafana/grafana-image-renderer/releases/latest/download/plugin-linux-x64-glibc-no-chromium.zip \
        plugins install grafana-image-renderer; \
-fi
+    fi

 ARG GF_INSTALL_PLUGINS=""

@@ -52,4 +47,4 @@ RUN if [ ! -z "${GF_INSTALL_PLUGINS}" ]; then \
          grafana-cli --pluginsDir "${GF_PATHS_PLUGINS}" plugins install ${plugin}; \
        fi \
      done \
-fi
+    fi
--- a/packaging/docker/push_to_docker_hub.sh
+++ b/packaging/docker/push_to_docker_hub.sh
@@ -29,10 +29,10 @@ else
  _grafana_version=$_grafana_tag
 fi

-export DOCKER_CLI_EXPERIMENTAL=enabled
-
 echo "pushing ${_docker_repo}:${_grafana_version}${TAG_SUFFIX}"

+export DOCKER_CLI_EXPERIMENTAL=enabled
+
 docker_push_all () {
  repo=$1
  tag=$2
--- a/packaging/docker/ubuntu.Dockerfile
+++ b/packaging/docker/ubuntu.Dockerfile
@@ -1,60 +0,0 @@
-ARG BASE_IMAGE=ubuntu:20.04
-FROM ${BASE_IMAGE} AS grafana-builder
-
-ARG GRAFANA_TGZ="grafana-latest.linux-x64.tar.gz"
-
-COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
-
-RUN mkdir /tmp/grafana && tar xzf /tmp/grafana.tar.gz --strip-components=1 -C /tmp/grafana
-
-FROM ${BASE_IMAGE}
-
-EXPOSE 3000
-
-# Set DEBIAN_FRONTEND=noninteractive in environment at build-time
-ARG DEBIAN_FRONTEND=noninteractive
-ARG GF_UID="472"
-ARG GF_GID="0"
-
-ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
-    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
-    GF_PATHS_DATA="/var/lib/grafana" \
-    GF_PATHS_HOME="/usr/share/grafana" \
-    GF_PATHS_LOGS="/var/log/grafana" \
-    GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
-    GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
-
-WORKDIR $GF_PATHS_HOME
-
-# Install dependencies
-# We need curl in the image
-RUN apt-get update && apt-get install -y ca-certificates curl tzdata && \
-    apt-get autoremove -y && rm -rf /var/lib/apt/lists/*;
-
-COPY --from=grafana-builder /tmp/grafana "$GF_PATHS_HOME"
-
-RUN if [ ! $(getent group "$GF_GID") ]; then \
-      addgroup --system --gid $GF_GID grafana; \
-    fi
-
-RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
-    mkdir -p "$GF_PATHS_HOME/.aws" && \
-    adduser --system --uid $GF_UID --ingroup "$GF_GID_NAME" grafana && \
-    mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
-             "$GF_PATHS_PROVISIONING/dashboards" \
-             "$GF_PATHS_PROVISIONING/notifiers" \
-             "$GF_PATHS_PROVISIONING/plugins" \
-             "$GF_PATHS_PROVISIONING/access-control" \
-             "$GF_PATHS_PROVISIONING/alerting" \
-             "$GF_PATHS_LOGS" \
-             "$GF_PATHS_PLUGINS" \
-             "$GF_PATHS_DATA" && \
-    cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
-    cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
-    chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
-
-COPY ./run.sh /run.sh
-
-USER "$GF_UID"
-ENTRYPOINT [ "/run.sh" ]
--- a/pkg/build/docker/build.go
+++ b/pkg/build/docker/build.go
@@ -70,12 +70,10 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
 	}

 	libc := "-musl"
-	dockerfile := "Dockerfile"
 	baseImage := fmt.Sprintf("%salpine:3.15", baseArch)
 	tagSuffix := ""
 	if useUbuntu {
 		libc = ""
-		dockerfile = "ubuntu.Dockerfile"
 		baseImage = fmt.Sprintf("%subuntu:20.04", baseArch)
 		tagSuffix = "-ubuntu"
 	}
@@ -120,7 +118,7 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
 	args := []string{
 		"build", "--build-arg", fmt.Sprintf("BASE_IMAGE=%s", baseImage),
 		"--build-arg", fmt.Sprintf("GRAFANA_TGZ=%s", archive), "--tag", tag, "--no-cache",
-		"-f", dockerfile, ".",
+		".",
 	}

 	log.Printf("Running Docker: docker %s", strings.Join(args, " "))