-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Fix podman build --pull-never #9631
Conversation
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rhatdan 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 |
This PR Requires containers/buildah#3062 |
e8b1860
to
8423eef
Compare
go.mod
Outdated
@@ -11,19 +11,19 @@ require ( | |||
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect | |||
github.com/containernetworking/cni v0.8.1 | |||
github.com/containernetworking/plugins v0.9.0 | |||
github.com/containers/buildah v1.19.7 | |||
github.com/containers/common v0.35.0 | |||
github.com/containers/buildah v1.19.2-0.20210305112159-898eea8fbefd |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be 1.20 something? I saw the commit in master, maybe I missed the 1.19 commit?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have not created a 1.20 yet, so I just put in the current commit id. Since we have not updated the main branch beyond v1.19.2 this is what it show up as.
IE I set the version to
898eea8fbefd73993406610311cad8fcab045bad
And then make vendor-in-container changes it to the above. BTW I think it might be time to cut a new buildah release.
cmd/podman/images/build.go
Outdated
@@ -307,7 +323,7 @@ func buildFlagsWrapperToOptions(c *cobra.Command, contextDir string, flags *buil | |||
} | |||
|
|||
if flags.PullNever { | |||
pullPolicy = imagebuildah.PullIfMissing | |||
pullPolicy = imagebuildah.PullNever |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OH OUCH!
ac627ef
to
7d694bd
Compare
@cevich of those failing tests (e.g. podman fedora-33 root host), what are running inside of a privileged container? |
Should just be the ones that have |
4e615b9
to
47fd974
Compare
c0b9855
to
21d9a01
Compare
039051e
to
d217898
Compare
I'm seeing |
@edsantiago This is all vendoring in a new version of Buildah. If we had a new release this PR would be much smaller. |
OK. I'm confused about the vendor downgrade from buildah 1.19.8 to .2.something, but will leave that for others to worry about. If you need to repush for any reason, what would you think of deleting these lines from the podman/test/buildah-bud/buildah-tests.diff Lines 106 to 113 in af91f27
|
Sure. |
1593df1
to
b79d294
Compare
bud test failing:
This is probably my fault: my bud test assumes that whatever is in |
@cevich We should have a new major release soon, in buildah, so there should be no rush. |
1f6948f
to
521bebc
Compare
Currently pull policy is set incorrectly when users set --pull-never. Also pull-policy is not being translated correctly when using podman-remote. Fixes: containers#9573 Signed-off-by: Daniel J Walsh <[email protected]>
/lgtm |
LGTM |
Fixes: #9573
Signed-off-by: Daniel J Walsh [email protected]