Use buildah commit and bud in podman #681

baude · 2018-04-26T18:05:56Z

Vendor in buildah and use as much of commit and bud as possible for podman
build and commit.

Resolves #586
Signed-off-by: baude [email protected]

mheon · 2018-04-26T18:11:35Z

LGTM

nalind · 2018-04-26T18:13:08Z

libpod/container_commit.go

+	// Cmd
+	// We cannot differentiate between cmd and entrypoint here
+	// so we assign args to both
+	importBuilder.SetCmd(c.Spec().Process.Args)


When we "docker commit" a container there, which of these is/are set in the image's configuration when you then "docker inspect" the result?

The both appear to make it

rhatdan · 2018-04-26T18:13:33Z

Can you grab the tests from buildah.bud to make sure they work.
bud.bats and all of the subdirs of bud.

baude · 2018-04-26T18:13:57Z

you want to add bats tests back into libpod?

rhatdan · 2018-04-26T18:14:32Z

@baude or convert them to the new format.

TomSweeneyRedHat

Good first pass. what a mess load of vendored files. Hope it doesn't make things too huge!

TomSweeneyRedHat · 2018-04-26T18:29:18Z

cmd/podman/build.go

-	for _, fileName := range c.StringSlice("file") {
-		budCmdArgs = append(budCmdArgs, "--file", fileName)
-	}
+	// The following was taken directly from projectatomic/buildah/cmd/bud.go


Can we keep this code in Buildah, vendor it in and then call that code from here? Otherwise we'll have two places to make changes in the future.

i didnt see any obvious ways

Lets move forward on this and revisit it in the future. @baude Could you add a FIXME or something suggesting that we look into a way to vendor or share the code between podman and buildah.

TomSweeneyRedHat · 2018-04-26T18:52:37Z

cmd/podman/build.go

+		}
+	}
+	pullPolicy := imagebuildah.PullNever
+	if c.BoolT("pull") {


will these still work? Or are all the flags defined in buildachl? I thought a few from here weren't there. I'd to go through some hoops to get the global flags working. There's a difference between Buildah's and Podman's global flags. Are they all hip?

if they are local variables yes.

TomSweeneyRedHat · 2018-04-26T18:56:27Z

cmd/podman/ioprojectatomicpodman/ioprojectatomicpodman.go

-
-	case "ImportImage":
-		return s__.ioprojectatomicpodmanInterface.ImportImage(VarlinkCall{call})
+	case "PullImage":


This is an awful lot of seemingly unrelated to the build changes stuff. I'd prefer it in it's own PR. Easier parsing the history months from now if there's an issue in either.

that is a dynamically generated file. nothing i can do about that

TomSweeneyRedHat · 2018-04-26T19:01:11Z

Travis tests are failing with a seccomp error that I don't recall seeing before....

# github.com/projectatomic/libpod/vendor/github.com/seccomp/libseccomp-golang
vendor/github.com/seccomp/libseccomp-golang/seccomp_internal.go:25:2: error: #error Minimum supported version of Libseccomp is v2.2.0
 #error Minimum supported version of Libseccomp is v2.2.0
  ^
make: *** [podman] Error 2

rh-atomic-bot · 2018-04-26T19:14:59Z

☔ The latest upstream changes (presumably 39a7a77) made this pull request unmergeable. Please resolve the merge conflicts.

mheon · 2018-04-26T21:03:53Z

Some failing commit tests

mheon · 2018-04-27T17:57:10Z

LGTM once tests are green

mheon · 2018-04-27T17:58:54Z

pkg/inspect/inspect.go

@@ -125,6 +125,7 @@ type ImageData struct {
 	RootFS          *RootFS           `json:"RootFS"`
 	Labels          map[string]string `json:"Labels"`
 	Annotations     map[string]string `json:"Annotations"`
+	ManifestType    string            `json:ManifestType`


Need "" marks around ManifestType

mheon · 2018-04-27T18:52:05Z

Need to manually build + install libseccomp >= 2.2.0 for travis

mheon · 2018-04-27T19:27:46Z

.travis.yml

@@ -11,7 +11,7 @@ before_install:
  - sudo apt-get -qq install autoconf automake bison e2fslibs-dev libfuse-dev libtool liblzma-dev gettext

 install:
-  - make install.tools
+  - make install.libseccomp.sudo install.tools


The Travis tests are all containerized, so these both do nothing

Need to add install.libseccomp.sudo to the Dockerfile and remove libseccomp from the things apt installs in the dockerfile

mheon · 2018-04-27T19:28:24Z

Makefile

@@ -249,6 +249,13 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man

 varlink_generate: .gopathok cmd/podman/varlink/ioprojectatomicpodman.go

+.PHONY: install.libseccomp.sudo


Move this to global .PHONY section

mheon · 2018-04-27T19:28:41Z

Makefile

+	git clone https://github.com/seccomp/libseccomp ../../seccomp/libseccomp
+	cd ../../seccomp/libseccomp && git checkout $(LIBSECCOMP_COMMIT) && ./autogen.sh && ./configure --prefix=/usr && make all && sudo make install
+
+


Extra newline

mheon · 2018-04-27T19:29:07Z

Makefile

+install.libseccomp.sudo:
+	rm -rf ../../seccomp/libseccomp
+	git clone https://github.com/seccomp/libseccomp ../../seccomp/libseccomp
+	cd ../../seccomp/libseccomp && git checkout $(LIBSECCOMP_COMMIT) && ./autogen.sh && ./configure --prefix=/usr && make all && sudo make install


Need to define $LIBSECCOMP_COMMIT somewhere - I suggest whatever's the most recent stable tag?

Vendor in buildah and use as much of commit and bug as possible for podman build and commit. Resolves containers#586 Signed-off-by: baude <[email protected]>

mheon · 2018-04-27T20:51:03Z

@rh-atomic-bot r+

rh-atomic-bot · 2018-04-27T20:51:04Z

📌 Commit 52fdca6 has been approved by mheon

rh-atomic-bot · 2018-04-27T20:51:10Z

⌛ Testing commit 52fdca6 with merge a824186...

rh-atomic-bot · 2018-04-27T21:16:35Z

☀️ Test successful - status-papr
Approved by: mheon
Pushing a824186 to master...

This directory just had Markdown and vendor.conf. I'm not sure why we have it in our version control, maybe old versions of vndr kept it? Or maybe folk dropped it into vendor/ by hand without using vndr? The history of that vendored directory is: * 619637a (Handle Linux Capabilities from command line, 2017-11-03, containers#17) added the three files to our version control. * c344fe6 (Update vendoring, 2017-11-22, containers#60) bumped hack/README.md. * af64e10 (Vendor in lots of kubernetes stuff to shrink image size, 2018-03-26, containers#554) bumped hack/README.md. * 27107fd (Vendor in latest containers/image and contaners/storage, 2018-04-18, containers#509) removed the files. * a824186 (Use buildah commit and bud in podman, 2018-04-25, containers#681) added the files back. * I'm removing them again in this commit. With this commit, $ vndr github.com/docker/docker becomes a no-op. Signed-off-by: W. Trevor King <[email protected]>

This directory just had Markdown and vendor.conf. I'm not sure why we have it in our version control, maybe old versions of vndr kept it? Or maybe folk dropped it into vendor/ by hand without using vndr? The history of that vendored directory is: * 619637a (Handle Linux Capabilities from command line, 2017-11-03, #17) added the three files to our version control. * c344fe6 (Update vendoring, 2017-11-22, #60) bumped hack/README.md. * af64e10 (Vendor in lots of kubernetes stuff to shrink image size, 2018-03-26, #554) bumped hack/README.md. * 27107fd (Vendor in latest containers/image and contaners/storage, 2018-04-18, #509) removed the files. * a824186 (Use buildah commit and bud in podman, 2018-04-25, #681) added the files back. * I'm removing them again in this commit. With this commit, $ vndr github.com/docker/docker becomes a no-op. Signed-off-by: W. Trevor King <[email protected]> Closes: #752 Approved by: baude

nalind reviewed Apr 26, 2018

View reviewed changes

baude force-pushed the build branch from 770ad13 to 1d85acb Compare April 26, 2018 18:27

TomSweeneyRedHat reviewed Apr 26, 2018

View reviewed changes

baude force-pushed the build branch from 1d85acb to 2fb0778 Compare April 26, 2018 19:04

baude force-pushed the build branch from 2fb0778 to 73770b5 Compare April 26, 2018 19:28

baude force-pushed the build branch 3 times, most recently from c866983 to 00adca1 Compare April 27, 2018 17:37

mheon reviewed Apr 27, 2018

View reviewed changes

baude force-pushed the build branch 2 times, most recently from bbc6a8e to 53cb271 Compare April 27, 2018 18:19

baude force-pushed the build branch 2 times, most recently from 9cb98f9 to a3f7e64 Compare April 27, 2018 19:04

mheon reviewed Apr 27, 2018

View reviewed changes

baude force-pushed the build branch 3 times, most recently from 536bec4 to 93dd25a Compare April 27, 2018 20:31

Use buildah commit and bud in podman

52fdca6

Vendor in buildah and use as much of commit and bug as possible for podman build and commit. Resolves containers#586 Signed-off-by: baude <[email protected]>

baude force-pushed the build branch from 93dd25a to 52fdca6 Compare April 27, 2018 20:47

rh-atomic-bot closed this in a824186 Apr 27, 2018

wking mentioned this pull request May 11, 2018

vendor/github.com/docker/docker/hack: Remove unused directory #752

Closed

baude deleted the build branch December 22, 2019 18:45

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 26, 2023

github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use buildah commit and bud in podman #681

Use buildah commit and bud in podman #681

baude commented Apr 26, 2018 •

edited by TomSweeneyRedHat

Loading

mheon commented Apr 26, 2018

nalind Apr 26, 2018

baude Apr 26, 2018

rhatdan commented Apr 26, 2018

baude commented Apr 26, 2018

rhatdan commented Apr 26, 2018

TomSweeneyRedHat left a comment

TomSweeneyRedHat Apr 26, 2018

baude Apr 26, 2018

rhatdan Apr 27, 2018

TomSweeneyRedHat Apr 26, 2018

baude Apr 26, 2018

TomSweeneyRedHat Apr 26, 2018 •

edited

Loading

baude Apr 26, 2018

TomSweeneyRedHat commented Apr 26, 2018

rh-atomic-bot commented Apr 26, 2018

mheon commented Apr 26, 2018

mheon commented Apr 27, 2018

mheon Apr 27, 2018

baude Apr 27, 2018

mheon commented Apr 27, 2018

mheon Apr 27, 2018

mheon Apr 27, 2018

mheon Apr 27, 2018

mheon Apr 27, 2018

mheon Apr 27, 2018

mheon commented Apr 27, 2018

rh-atomic-bot commented Apr 27, 2018

rh-atomic-bot commented Apr 27, 2018

rh-atomic-bot commented Apr 27, 2018

		@@ -249,6 +249,13 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man

		varlink_generate: .gopathok cmd/podman/varlink/ioprojectatomicpodman.go

		.PHONY: install.libseccomp.sudo

		git clone https://github.com/seccomp/libseccomp ../../seccomp/libseccomp
		cd ../../seccomp/libseccomp && git checkout $(LIBSECCOMP_COMMIT) && ./autogen.sh && ./configure --prefix=/usr && make all && sudo make install

Use buildah commit and bud in podman #681

Use buildah commit and bud in podman #681

Conversation

baude commented Apr 26, 2018 • edited by TomSweeneyRedHat Loading

mheon commented Apr 26, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rhatdan commented Apr 26, 2018

baude commented Apr 26, 2018

rhatdan commented Apr 26, 2018

TomSweeneyRedHat left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TomSweeneyRedHat Apr 26, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TomSweeneyRedHat commented Apr 26, 2018

rh-atomic-bot commented Apr 26, 2018

mheon commented Apr 26, 2018

mheon commented Apr 27, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mheon commented Apr 27, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mheon commented Apr 27, 2018

rh-atomic-bot commented Apr 27, 2018

rh-atomic-bot commented Apr 27, 2018

rh-atomic-bot commented Apr 27, 2018

baude commented Apr 26, 2018 •

edited by TomSweeneyRedHat

Loading

TomSweeneyRedHat Apr 26, 2018 •

edited

Loading