Skip to content

Dockerfile: merge build stages#249

Merged
thaJeztah merged 1 commit intodocker:masterfrom
crazy-max:upd-dockerfile
Oct 1, 2025
Merged

Dockerfile: merge build stages#249
thaJeztah merged 1 commit intodocker:masterfrom
crazy-max:upd-dockerfile

Conversation

@crazy-max
Copy link
Copy Markdown
Member

don't need extra stages per target os.

Signed-off-by: CrazyMax [email protected]

Comment thread Dockerfile
make build-osxkeychain build-pass PACKAGE=$PACKAGE VERSION=$(cat /tmp/.version) REVISION=$(cat /tmp/.revision) DESTDIR=/out
xx-verify /out/docker-credential-osxkeychain
xx-verify /out/docker-credential-pass
case "$(xx-info os)" in
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Isn't this the same as TARGETOS ?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

We use xx-info os because we don't expose ARG TARGETOS but ARG TARGETPLATFORM which already contains the os and xx is able to parse: https://github.com/tonistiigi/xx/blob/aba3b88003b046b8557cdf25959ba0c3c81394c2/base/xx-info#L82

It's just to avoid adding the extra TARGETOS arg if that makes sense.

@thaJeztah
Copy link
Copy Markdown
Member

This one needs a rebase; I tried to do so locally (can push); think one of the conflicts is related to;

Which probably needs to be added in the RUN

@crazy-max crazy-max force-pushed the upd-dockerfile branch 4 times, most recently from 2813716 to 2edfd6b Compare October 1, 2025 14:33
@crazy-max
Copy link
Copy Markdown
Member Author

This one needs a rebase; I tried to do so locally (can push); think one of the conflicts is related to;

* [osxkeychain: match min macos version for xx #283](https://github.com/docker/docker-credential-helpers/pull/283)

Which probably needs to be added in the RUN

Ah forgot about this one, should be good now

@crazy-max crazy-max requested a review from thaJeztah October 1, 2025 14:35
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

Comment thread Dockerfile
xx-verify /out/docker-credential-secretservice
;;
darwin)
go install std
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Does this need that other change?

      export MACOSX_VERSION_MIN=$(make print-MACOSX_DEPLOYMENT_TARGET)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

oh! never mind you put it further up :see

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

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