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

Tag image with chromium version as build metadata #13

Closed
wants to merge 2 commits into from
Closed

Tag image with chromium version as build metadata #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99dcd37
scripts/chromium-version: extracts version from Dockerfile
nadiamoe Aug 28, 2024
89818f9
ci/publish-container: append `+chromium-VERSION` to tag
nadiamoe Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/publish-container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
run: |-
echo "name=$(basename '${{ github.repository }}')" >> $GITHUB_OUTPUT
echo "version=$(./scripts/version)" >> $GITHUB_OUTPUT
echo "chromium-version=$(./scripts/chromium-version Dockerfile)" >> $GITHUB_OUTPUT
cat $GITHUB_OUTPUT
- name: Login to Google Artifact Registry
uses: grafana/shared-workflows/actions/login-to-gar@main
Expand All @@ -32,5 +33,5 @@ jobs:
with:
image_name: ${{ steps.repo.outputs.name }}
tags: |-
${{ steps.repo.outputs.version }}
${{ steps.repo.outputs.version }}+chromium-${{ steps.repo.outputs.chromium-version }}
push: true
20 changes: 20 additions & 0 deletions scripts/chromium-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/usr/bin/env bash
# vim:ft=bash

# This script parses the chromium version being installed on a given dockerfile, assuming it is in the form of:
# chromium-swiftshader=VERSION
# It exits with non-zero code if no version could be parsed.

set -eo pipefail

if [[ -z "$1" ]]; then
echo "Usage: $0 <path/to/Dockerfile>"
exit 1
fi

version=$(sed -nr 's/.*chromium-swiftshader=([0-9A-Za-z+._-]+).*/\1/p' "$1")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to go take a look at the dockerfile just to figure out why the regular expression is expecting "stuff" around it. Adding comments or changing the formatting of the line might end up breaking this.

I think you can make this more robust if you change the dockerfile.

Add:

ARG chromium_version=126.0.6478.126-r1

and

RUN apk --no-cache add --repository community tini=0.19.0-r3 && \
  apk --no-cache add --repository community chromium-swiftshader=$chromium_version

and then the script can anchor the regular expression correctly:

sed -nr 's/^ARG chromium_version=([0-9A-Za-z+._-]+)$/\1/p'

Also, why are you expecting + and _ to show up there? Even the letters are a bit questionable. But with this change I would be more open to this:

sed -nr 's/^ARG chromium_version=(.+)$/\1/p'

as that is saying "I'll take whatever is the value of this variable". You might want to trim end-of-line whitespace, just to be nice to puny humans....

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went for matching the whole dockerfile because it's the same thing #5 does, I'd rather not duplicate it. #5 cannot (reliably) work with ARG ... because it needs to know the repository (main or community) where this is pulled from.

if [[ -z $version ]]; then
exit 1
fi

echo "$version"
Loading