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.

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

Conversation

nadiamoe
Copy link
Member

Following consensus on https://docs.google.com/document/d/1ZbjNIrk-i3DYB1_jklr5Xx4hDc8Px4bP-zIK-TXYsCQ/edit

Implementation-wise, a small script extracts the chromium version from the apk add ... line in Dockerfile, which is then appended to the build tag.

Requires #5

@nadiamoe nadiamoe requested a review from a team as a code owner August 28, 2024 10:59
@nadiamoe nadiamoe changed the base branch from main to ci-renovate-alpine August 28, 2024 10:59
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.

@nadiamoe
Copy link
Member Author

Closing for now as Docker does not support + in tags.

@nadiamoe nadiamoe closed this Aug 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants