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

Docker build script fixes #8685

Merged
merged 2 commits into from
May 25, 2024
Merged

Docker build script fixes #8685

merged 2 commits into from
May 25, 2024

Conversation

sschuberth
Copy link
Member

Please have a look at the individual commit messages for the details.

@sschuberth sschuberth requested a review from a team as a code owner May 23, 2024 15:42
@sschuberth sschuberth enabled auto-merge (rebase) May 23, 2024 15:42
@sschuberth sschuberth requested a review from heliocastro May 23, 2024 15:42
Copy link
Member

Choose a reason for hiding this comment

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

... but this is the least intrusive fix

Maybe, but wouldn't it be cleaner to just remove the --build-arg lines instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

That's what I was trying at first as well, but it does not work as the variables are also used as part of version strings / tags like "${JAVA_VERSION}-jdk-${UBUNTU_VERSION}".

Copy link

codecov bot commented May 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.85%. Comparing base (d8fb1d0) to head (c996a2c).

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #8685      +/-   ##
============================================
+ Coverage     67.53%   67.85%   +0.31%     
  Complexity     1165     1165              
============================================
  Files           245      244       -1     
  Lines          7772     7736      -36     
  Branches        867      865       -2     
============================================
  Hits           5249     5249              
+ Misses         2164     2128      -36     
  Partials        359      359              
Flag Coverage Δ
funTest-docker 66.84% <ø> (ø)
funTest-non-docker 34.17% <ø> (-0.03%) ⬇️
test 38.01% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sschuberth sschuberth force-pushed the docker-build-script branch from 361ff45 to 5792b47 Compare May 23, 2024 18:27
This is a fixup for ae16d01. It somewhat takes the long way around,
reading the variables from `versions.dockerfile` just to pass them in as
build arguments again, but this is the least intrusive fix.

Signed-off-by: Sebastian Schuberth <[email protected]>
This enables compatibility with the `--build-context` option as used by
the `docker_build.sh` script. Also see [1].

[1]: https://codeberg.org/devthefuture/dockerfile-x/issues/4

Signed-off-by: Sebastian Schuberth <[email protected]>
@sschuberth sschuberth requested a review from mnonnenmacher May 24, 2024 20:06
@sschuberth sschuberth force-pushed the docker-build-script branch from 5792b47 to c996a2c Compare May 24, 2024 20:07
Copy link
Contributor

@heliocastro heliocastro left a comment

Choose a reason for hiding this comment

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

Pretty much correct. Docker doesn't have a unified way to get a general build arts by file environment, so this solution fix the local issue.

@sschuberth sschuberth merged commit b6044b0 into main May 25, 2024
20 checks passed
@sschuberth sschuberth deleted the docker-build-script branch May 25, 2024 08:03
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.

3 participants