Build: Streamline and sync dockerfiles

[DanCech]

While working on #58005 I noticed many inconsistencies between our various dockerfiles as well as opportunities to streamline them.

This PR attempts to take the best parts of our various dockerfiles and align between alpine and ubuntu as well as between dev and packaging. It also syncs and streamlines the custom dockerfiles.

• adds a header to the 2 main dockerfiles reminding devs that they need to be kept in sync
• optimizes the build containers for cacheability (separating dependencies from our code)
• combines RUN statements to reduce layer count
• standardizes multi-line RUN indentation
• combines and removes unneeded COPY statements
• uses USER "$GF_UID" across all images for maximum compatibility
• standardizes on /tmp/grafana for build & temp files
• standardizes on ARG GF_GID="0"
• removes unneeded apk/apt upgrade in custom dockerfiles
• switches from gdebi to apt-get for chrome installation

After the dockerfiles were in sync I observed that the differences between alpine and ubuntu dockerfiles were relatively small and isolated to the RUN commands and underlying images, so by updating the RUN commands to detect alpine or ubuntu and updating the build scripts to pass the correct images as build args we can consolidate to 2 docker images.

In a follow-up PR we should be able to use buildkit to combine the main and packaging dockerfiles into a single dockerfile that detects whether a tarball is provided and either extracts that or builds the source.

[grafanabot]

Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/40532

[grafanabot]

Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/41224

[grafanabot]

Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/41298

[grafanabot]

Drone build failed: https://drone.grafana.net/grafana/grafana-enterprise/41752

[zuchka]

this PR potentially fixes #58921

[mpeaton-ng]

This does build cleanly for me, less some minor mods for injecting ca-certifcates. However it failes at runtime:
/run.sh: line 80: exec: grafana-server: not found

[DanCech]

This does build cleanly for me, less some minor mods for injecting ca-certifcates. However it failes at runtime: /run.sh: line 80: exec: grafana-server: not found

Hmm, might be an issue with the PATH changes, thanks for the feedback I'll check it out.

[DanCech]

This does build cleanly for me, less some minor mods for injecting ca-certifcates. However it failes at runtime: /run.sh: line 80: exec: grafana-server: not found

Hmm, might be an issue with the PATH changes, thanks for the feedback I'll check it out.

I haven't been able to duplicate the problem, test images built using all 4 of these methods work as expected:

make build-docker-full
make build-docker-full-ubuntu
GRAFANA_TGZ=grafana-9.2.3.linux-amd64.tar.gz ./build.sh --fast 9.2.3
GRAFANA_TGZ=grafana-9.2.3.linux-amd64.tar.gz ./build.sh --fast --ubuntu 9.2.3

You mentioned mods to inject ca-certificates, did you possibly do something that would change the PATH setting?

We set the path to ENV PATH="/usr/share/grafana/bin:$PATH" which is what allors run.sh to find the grfana-server binary without an explicit path being specified, so if the PATH does not include /usr/share/grafana/bin it won't work.

[mpeaton-ng]

I did not. I did, however, what I believe to be a working patch to main in the comments on make build-docker-full* fails · Issue #58921 · grafana/grafana (github.com)<#58921>. From: Dan Cech ***@***.***> Sent: Sunday, November 20, 2022 5:08 PM To: grafana/grafana ***@***.***> Cc: Eaton, Michael [US] (DS) ***@***.***>; Comment ***@***.***> Subject: EXT :Re: [grafana/grafana] Build: Streamline and sync dockerfiles (PR #58101) This does build cleanly for me, less some minor mods for injecting ca-certifcates. However it failes at runtime: /run.sh: line 80: exec: grafana-server: not found Hmm, might be an issue with the PATH changes, thanks for the feedback I'll check it out. I haven't been able to duplicate the problem, test images built using all 4 of these methods work as expected: make build-docker-full make build-docker-full-ubuntu GRAFANA_TGZ=grafana-9.2.3.linux-amd64.tar.gz ./build.sh --fast 9.2.3 GRAFANA_TGZ=grafana-9.2.3.linux-amd64.tar.gz ./build.sh --fast --ubuntu 9.2.3 You mentioned mods to inject ca-certificates, did you possibly do something that would change the PATH setting? We set the path to ENV PATH="/usr/share/grafana/bin:$PATH" which is what allors run.sh to find the grfana-server binary without an explicit path being specified, so if the PATH does not include /usr/share/grafana/bin it won't work. — Reply to this email directly, view it on GitHub<#58101 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/A3FKSBVBA65WPAC4YRQNMNDWJKONBANCNFSM6AAAAAARVSAMTI>. You are receiving this because you commented.Message ID: ***@***.******@***.***>>

[DanCech]

I did not. I did, however, what I believe to be a working patch to main in the comments on make build-docker-full* fails · Issue #58921

That should not be required with this branch, it includes an update that fixes the problem that patch was trying to solve.

[grongor]

Hi! I might be wrong, but shouldn't there be a semicolon before the backslash? https://github.com/grafana/grafana/pull/58101/files#diff-dfdb3f200d18eadfb7dca9193b67c2b8b5c8e59472317372b14bb9f3ad1fe04fR15

if [ $GF_INSTALL_IMAGE_RENDERER_PLUGIN = "true" ]; then \
  apk add --no-cache udev ttf-opensans chromium \
fi

->

if [ $GF_INSTALL_IMAGE_RENDERER_PLUGIN = "true" ]; then \
  apk add --no-cache udev ttf-opensans chromium ; \
fi

[DanCech]

you're absolutely correct, I'll open a PR to fix that!

[grafanabot]

Hello @DanCech!
Backport pull requests need to be either:

• Pull requests which address bugs,
• Urgent fixes which need product approval, in order to get merged,
• Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

[grafanabot]

The backport to v9.3.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-58101-to-v9.3.x origin/v9.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 9fec54df2dd37c68b26f0d59d809924ea3342cf1
# Push it to GitHub
git push --set-upstream origin backport-58101-to-v9.3.x
git switch main
# Remove the local backport branch
git branch -D backport-58101-to-v9.3.x

Then, create a pull request where the base branch is v9.3.x and the compare/head branch is backport-58101-to-v9.3.x.