summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAge
* Merge pull request #818 from wking/python-2-cleanMatthew Heon2018-09-27
|\ | | | | Makefile: Call contrib/python's clean regardless of HAS_PYTHON3
| * Makefile: Drop PYTHONW. Trevor King2018-09-13
| | | | | | | | | | | | | | This line landed in 8493dba2 (Initial varlink implementation, 2018-03-26, #627), but this Makefile has never consumed that variable. Signed-off-by: W. Trevor King <wking@tremily.us>
| * Makefile: Call contrib/python's clean regardless of HAS_PYTHON3W. Trevor King2018-09-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only Python dependency in contrib/python's clean is: $(PYTHON) setup.py clean --all and our setup.pys work on both major Python versions: $ make -C contrib/python/podman PYTHON=python2 clean make: Entering directory `/.../libpod/contrib/python/podman' python2 setup.py clean --all /usr/lib64/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'python_requires' warnings.warn(msg) running clean 'build/lib' does not exist -- can't clean it 'build/bdist.linux-x86_64' does not exist -- can't clean it 'build/scripts-2.7' does not exist -- can't clean it rm -rf podman.egg-info dist find . -depth -name __pycache__ -exec rm -rf {} \; find . -depth -name \*.pyc -exec rm -f {} \; make: Leaving directory `/.../libpod/contrib/python/podman' $ echo $? 0 $ make -C contrib/python/pypodman PYTHON=python2 clean make: Entering directory `/.../libpod/contrib/python/pypodman' python2 setup.py clean --all /usr/lib64/python2.7/distutils/dist.py:267: UserWarning: Unknown distribution option: 'python_requires' warnings.warn(msg) running clean removing 'build/lib' (and everything under it) removing 'build/bdist.linux-x86_64' (and everything under it) 'build/scripts-2.7' does not exist -- can't clean it removing 'build' rm -rf pypodman.egg-info dist find . -depth -name __pycache__ -exec rm -rf {} \; find . -depth -name \*.pyc -exec rm -f {} \; make: Leaving directory `/.../libpod/contrib/python/pypodman' $ echo $? 0 This rolls back part of 390bd16d (tidy up the copr spec, 2018-05-20, #813). I've also shifted the submake cleans to the end of the main clean recipe. That way, if one of the submake cleans dies (e.g. because the system lacks Python entirely), the temp-file removal will still happen. The way I have it setup now, the podman clean dying will keep any of the pypodman clean from happening. You could probably work around that with something like: $(MAKE) -C contrib/python/podman clean & \ $(MAKE) -C contrib/python/pypodman clean & \ wait but that seems too fancy for such a corner case. Signed-off-by: W. Trevor King <wking@tremily.us>
* | rework CI tests to test on VMsbaude2018-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR makes several key changes to our CI testing. Firstly, we now test podman on fedora 28, fedora 29, and centos VMS (rather than containers). Any of these that having failing tests are not marked as required yet. We still preserve the podman in podman and podman in docker tests as well and they are marked as required. The lint and validate work is now done on a openshift container. We also removed the rpm verification on papr and perform this test under the "images" test on the openshift ci. This PR exposes integration test fails on some of our OSs. My expectation is we will fix those in additional PRs and as they are fixed, we should be flipping the boolean bit to required. Signed-off-by: baude <bbaude@redhat.com> Closes: #1492 Approved by: mheon
* | Bump gitvalidation epochMatthew Heon2018-09-25
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* | Bump gitvalidation epochMatthew Heon2018-09-21
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* | Replace all usages of "install -D" with "install -d"Jhon Honce2018-09-18
| | | | | | | | | | | | | | | | | | Fixes #1481 Signed-off-by: Jhon Honce <jhonce@redhat.com> Closes: #1496 Approved by: rhatdan
* | Bump gitvalidation epochMatthew Heon2018-09-17
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* | Bump gitvalidation epochMatthew Heon2018-09-14
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* | Merge pull request #1434 from rhatdan/waitMatthew Heon2018-09-14
|\ \ | | | | | | Add --interval flag to podman wait
| * | Add --interval flag to podman waitDaniel J Walsh2018-09-13
| |/ | | | | | | | | | | | | Waiting uses a lot of CPU, so drop back to checking once/second and allow user to pass in the interval. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* / Update gitvalidation epoch to avoid a bad commitMatthew Heon2018-09-14
|/ | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* dont make python when running makebaude2018-09-12
| | | | | | | Signed-off-by: baude <bbaude@redhat.com> Closes: #1443 Approved by: mheon
* Bump gitvalidation epochMatthew Heon2018-09-10
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Bump gitvalidation epochMatthew Heon2018-09-07
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Bump gitvalidation epochMatthew Heon2018-08-31
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Bump gitvalidation epochMatthew Heon2018-08-24
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Swap from FFJSON to easyjsonMatthew Heon2018-08-24
| | | | | | | | | | | | | | | FFJSON has serialization differences versus stock Go - namely, it does not respect the MarshalText() and UnmarshalText() methods, particularly on []byte, which causes incompatability with pre-FFJSON containers which contained DNS servers. EasyJSON does not have these issues, and might even be slightly faster. Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1322 Approved by: mheon
* Make 'make clean' remove FFJSON generated codeMatthew Heon2018-08-24
| | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1322 Approved by: mheon
* make dbuild fixed on ubuntu/debianKunal Kushwaha2018-08-21
| | | | | | | Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp> Closes: #1309 Approved by: mheon
* Bump gitvalidation epochMatthew Heon2018-08-17
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* switch projectatomic to containersDaniel J Walsh2018-08-16
| | | | | | | | | | Need to get some small changes into libpod to pull back into buildah to complete buildah transition. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #1270 Approved by: mheon
* Bump gitvalidation epochMatthew Heon2018-08-11
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Merge pull request #1254 from mheon/systemd_cgroups_defaultMatthew Heon2018-08-11
|\ | | | | Switch default CGroup manager to systemd
| * Only use cgroupfs for containerized testsMatthew Heon2018-08-10
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* | Bump gitvalidation epochDaniel J Walsh2018-08-10
|/ | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #1256 Approved by: rhatdan
* Don't require .gopathok for individual FFJSON targetsMatthew Heon2018-08-09
| | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1240 Approved by: rhatdan
* Add FFJSON generation to makefileMatthew Heon2018-08-09
| | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #1240 Approved by: rhatdan
* Pass DESTDIR down to python MakefileDaniel J Walsh2018-08-07
| | | | | | | | | | | | In order to get a cleaner build out of the rpms we should pass down the DESTDIR to the python Makefiles. Then we can use them instead of hard coding other inteligence into the spec files. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #1214 Approved by: baude
* Rename varlink socket and interfacebaude2018-08-06
| | | | | | | | | io.projectatomic.podman -> io.podman Signed-off-by: baude <bbaude@redhat.com> Closes: #1204 Approved by: mheon
* Bump gitvalidation epochMatthew Heon2018-08-03
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Update gitvalidation epochMatthew Heon2018-08-03
| | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com> Closes: #1210 Approved by: rhatdan
* Bump gitvalidation epochMatthew Heon2018-07-27
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Fix up docker compatibility messagesDaniel J Walsh2018-07-27
| | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #1170 Approved by: mheon
* [WIP] Refactor and simplify python buildsJhon Honce2018-07-23
| | | | | | | | | | | * pypodman namespaced in site-packages * version numbers pulled from requirements.txt * add python-podman spec file to install eggs Signed-off-by: Jhon Honce <jhonce@redhat.com> Closes: #1106 Approved by: rhatdan
* Bump gitvalidation epochMatthew Heon2018-07-20
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Update gitvalidation epochMatthew Heon2018-07-17
| | | | | | | | | | Homu merged a commit without a signoff, update our Gitvalidation epoch to after said commit to prevent problems. Signed-off-by: Matthew Heon <mheon@redhat.com> Closes: #1105 Approved by: vrothberg
* Bump gitvalidation epochMatthew Heon2018-07-13
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Update python directories to better support setup.pyJhon Honce2018-07-13
| | | | Signed-off-by: Jhon Honce <jhonce@redhat.com>
* podman/libpod: add default AppArmor profileValentin Rothberg2018-07-11
| | | | | | | | | | | | | | | | | Make users of libpod more secure by adding the libpod/apparmor package to load a pre-defined AppArmor profile. Large chunks of libpod/apparmor come from github.com/moby/moby. Also check if a specified AppArmor profile is actually loaded and throw an error if necessary. The default profile is loaded only on Linux builds with the `apparmor` buildtag enabled. Signed-off-by: Valentin Rothberg <vrothberg@suse.com> Closes: #1063 Approved by: rhatdan
* Bump gitvalidation epochMatthew Heon2018-07-06
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Makefile: Use a pattern rule for cross-compilationW. Trevor King2018-07-06
| | | | | | | | | | | | | | | | | | | | | | | Pattern-rule documentation is in [1]. This commit follows the basic approach from [2], with the portable build tags from [3]. Using --keep-going allows folks to see errors for multiple target platforms. For example, if the Darwin target dies, we'll still attempt to build the Linux target before erroring out. I've added an ALLOWED_TO_FAIL environment variable to mark script blocks for the the allow_failures block. Currently we're requiring builds from Linux for Linux and OS X to succeed, but allowing builds from OS X to both targets to fail. [1]: https://www.gnu.org/software/make/manual/html_node/Pattern-Intro.html#Pattern-Intro [2]: https://github.com/kubernetes-incubator/cri-o/commit/e5031fcf9af7d6c78d21e38ab9f82d2392ba05e8 [3]: https://github.com/kubernetes-incubator/cri-o/pull/1653 Signed-off-by: W. Trevor King <wking@tremily.us> Closes: #1034 Approved by: baude
* more changes to compile darwinbaude2018-07-05
| | | | | | | | | | | | | | | | this should represent the last major changes to get darwin to **compile**. again, the purpose here is to get darwin to compile so that we can eventually implement a ci task that would protect against regressions for darwin compilation. i have left the manual darwin compilation largely static still and in fact now only interject (manually) two build tags to assist with the build. trevor king has great ideas on how to make this better and i will defer final implementation of those to him. Signed-off-by: baude <bbaude@redhat.com> Closes: #1047 Approved by: rhatdan
* Makefile: Use 'git diff' to show gofmt changesW. Trevor King2018-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes fixing errors easier. Before this commit, errors looked like [1]: $ make gofmt libpod/container_linux.go:1::warning: file is not gofmted with -s (gofmt) make: *** [gofmt] Error 1 But that's not very helpful when your local gofmt thinks the file is fine. With this commit, errors will look like: $ make gofmt find . -name '*.go' ! -path './vendor/*' -exec gofmt -s -w {} \+ git diff --exit-code diff --git a/libpod/container_internal.go b/libpod/container_internal.go index df4de3fe..22b39870 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -1,7 +1,7 @@ package libpod import ( -"bytes" + "bytes" "context" "encoding/json" "fmt" make: *** [Makefile:87: gofmt] Error 1 (or whatever, I just stuffed in a formatting error for demonstration purposes). Also remove the helper script in favor of direct Makefile calls, because with Git handling difference reporting and exit status, this becomes a simpler check. find's -exec, !, and -path arguments are specified in POSIX [2]. [1]: https://travis-ci.org/kubernetes-incubator/cri-o/jobs/331949394#L1075 [2]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/find.html Signed-off-by: W. Trevor King <wking@tremily.us> Closes: #1038 Approved by: rhatdan
* changes to allow for darwin compilationbaude2018-06-29
| | | | | | | Signed-off-by: baude <bbaude@redhat.com> Closes: #1015 Approved by: baude
* Bump gitvalidation epochMatthew Heon2018-06-29
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Add podman-image and podman-container man page linksDaniel J Walsh2018-06-25
| | | | | | | | | | | | | | podman image and podman container have alternate CLI to standard CLI for a lot of commands. The man pages can be shared between both. This patch adds links so that of some executes `podman image load`, they will actually see the `podman load` man page. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #993 Approved by: mheon
* make varlink optional for podmanbaude2018-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some platforms and operating systems do not have varlink. in those cases, we need to be able to turn off enablement of varlink in podman. this can now be done with BUILDTAGS passed to the build though perhaps in the future will be better. the default is to build with varlink Signed-off-by: baude <bbaude@redhat.com> squash! make varlink optional for podman The API.md and cmd/podman/varlink/ioprojectatomicpodman.go targets will continue to work regardless of the presence (or not) of 'varlink' is in BUILDTAGS. However, cmd/podman/varlink/ioprojectatomicpodman.go is now only required by the podman target when BUILDTAGS contains 'varlink'. API.md had also been an podman dependency since 5b2627dd (Makefile: Drop find-godeps.sh for podman target, 2018-05-15, #776) when I expanded varlink_api_generate. It had been an indirect podman dependency (via varlink_api_generate) since 25263558 (Generate varlink API documentation automatically, 2018-05-07, #734). But the podman executable obviously doesn't depend on the Markdown file, so I'm removing that dependency here. Signed-off-by: baude <bbaude@redhat.com> squash! make varlink optional for podman The command-pointer approach will scale well if/when we add additional optional commands behind their own build tags, because those tags won't all be competing for the same getOptionalCommands namespace. Signed-off-by: W. Trevor King <wking@tremily.us> Closes: #987 Approved by: rhatdan
* Bump gitvalidation epochMatthew Heon2018-06-22
| | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Update gitvalidation epochMatthew Heon2018-06-18
| | | | | | | | | | A commit snuck through without a DCO, update to a commit after the broken one. Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #957 Approved by: mheon