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

Backport #11976 to 3.4 #12327

Merged
merged 1 commit into from
Nov 17, 2021
Merged

Conversation

zeha
Copy link

@zeha zeha commented Nov 17, 2021

What this PR does / why we need it:

Backport #11976 (DNS fix for macOS) to 3.4 branch.

How to verify it

Builds can use private DNS servers or mDNS available only on the macOS side to pull images from (private) registries.

Which issue(s) this PR fixes:

Fixes #10737

Special notes for your reviewer:

Need to use CGO for mDNS resolution, but cross builds need CGO disabled
See golang/go#12524 for details

Note: Homebrew forumla will need to be updated to pick up this change

Fixes containers#10737

Signed-off-by: Jhon Honce <jhonce@redhat.com>
@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 17, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 17, 2021

@zeha: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@zeha zeha changed the base branch from main to v3.4 November 17, 2021 10:55
@rhatdan
Copy link
Member

rhatdan commented Nov 17, 2021

Thanks @zeha
LGTM
/approve
@giuseppe @vrothberg @flouthoc PTAL

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 17, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan, zeha

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 17, 2021
@flouthoc
Copy link
Collaborator

LGTM

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 17, 2021
@mheon
Copy link
Member

mheon commented Nov 17, 2021

I don't know why this is labelled needs-rebase. I'm going to manually remove said label.

@mheon mheon removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 17, 2021
@openshift-merge-robot openshift-merge-robot merged commit 7203178 into containers:v3.4 Nov 17, 2021
@zeha zeha deleted the backport-11976 branch November 17, 2021 23:58
zeha added a commit to zeha/podman that referenced this pull request Jan 26, 2022
NATIVE_GOOS does not exist in the 3.4 branch, only on main.
Fixes my backport containers#12327. Verified to fix containers#12975 (again) for me.

Signed-off-by: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

podman remote bypass system resolver and fails to resolve mDNS hostnames.
7 participants