summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #5875 from rhatdan/networkOpenShift Merge Robot2020-04-21
|\ | | | | Cleanup network option parsing
| * Cleanup network option parsingDaniel J Walsh2020-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were not handling the parsing of --ip. This pr adds validation checks and now will support the flag. Move validation to the actual parsing of the network flags. We should only parse the dns flags if the user changed them. We don't want to pass default options if set in containers.conf to the server. Potential for duplicating defaults. Add support for --dns-opt flag passing Begin handling of --network flag, although we don't have a way right now to translate a string into a specgen.Namespace. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #5863 from vrothberg/v2-fix-rmiOpenShift Merge Robot2020-04-21
|\ \ | | | | | | podman rmi: refactor logic
| * | podman rmi: refactor logicValentin Rothberg2020-04-21
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While this commit was initially meant to fix #5847, it has turned into a bigger refactoring which I did not manage to break into smaller pieces: * Fix #5847 by refactoring the image-removal logic. * Make the api handler for image-removal use the ABI code. This way, both (i.e., ABI and Tunnel) end up using the same code. Achieving this code share required to move some code around to prevent circular dependencies. * Everything in pkg/api (excluding pkg/api/types) must now only be accessed from code using `ABISupport`. * Avoid imports from entities on handlers to prevent circular dependencies. * Move `podman system service` logic into `cmd` to prevent circular dependencies - it depends on pkg/api. * Also remove the build header from infra/abi files. It will otherwise confuse swagger and other tools; errors we cannot fix as go doesn't expose a build-tag env variable. Fixes: #5847 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #5883 from abitrolly/patch-3OpenShift Merge Robot2020-04-20
|\ \ | | | | | | Return labes in API (fixes #5882)
| * | Return labes in API (fixes #5882)Anatoli Babenia2020-04-20
| |/ | | | | | | Signed-off-by: Anatoli Babenia <anatoli@rainforce.org>
* | Merge pull request #5862 from rhatdan/v2OpenShift Merge Robot2020-04-20
|\ \ | | | | | | Fix up handling of image data as well as setting Linux Capabilties correctly
| * | Fix podman inspect to accept -l and -s fieldsDaniel J Walsh2020-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman inspect has a breaking change in that it dropped --latest and --size options. This PR adds these back. Lots of tests rely on podman inspect -l. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | Handle Linux Capabilities correctlyDaniel J Walsh2020-04-20
| | | | | | | | | | | | | | | | | | | | | | | | If user sets capabilities list we need handle minimal capabilities. Also handle seccomp-policy being passed in. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | Add functions to return image informationsDaniel J Walsh2020-04-20
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #5899 from jwhonce/wip/treeOpenShift Merge Robot2020-04-20
|\ \ \ | | | | | | | | V2 podman image tree
| * | | V2 podman image treeJhon Honce2020-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Basic port of V1 podman image tree ID TODO: Refactor to return tree from service and format in presentation layer TODO: Support tunneling mode Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #5901 from jwhonce/wip/serviceOpenShift Merge Robot2020-04-20
|\ \ \ \ | | | | | | | | | | V2 Remove existing unix domain socket on startup
| * | | | V2 Rmove existing unix domain socket on startupJhon Honce2020-04-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #5889 from giuseppe/rootless-fd-joinOpenShift Merge Robot2020-04-20
|\ \ \ \ \ | |_|_|/ / |/| | | | rootless: move join namespace inside child process
| * | | | rootless: move join namespace inside child processGiuseppe Scrivano2020-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open the namespace file descriptors inside of the child process. Closes: https://github.com/containers/libpod/issues/5873 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | rootless: skip looking up parent user nsGiuseppe Scrivano2020-04-20
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | since we join directly the conmon user namespace, there is no need to look up its parent user namespace, as we can safely assume it is the init namespace. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #5896 from giuseppe/fix-cgroup-setOpenShift Merge Robot2020-04-20
|\ \ \ \ | | | | | | | | | | common: setting cgroup resources correctly
| * | | | common: setting cgroup resources correctlyGiuseppe Scrivano2020-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix some cgroups related integration tests. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #5897 from jwhonce/wip/diffOpenShift Merge Robot2020-04-20
|\ \ \ \ \ | |_|_|/ / |/| | | | V2 Fix --latest for podman diff commands
| * | | | V2 Fix --latest for podman diff commandsJhon Honce2020-04-20
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * --latest now forces container diff * diff options now passed into domain layer * updated help/usage messages Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #5879 from rhatdan/pullOpenShift Merge Robot2020-04-20
|\ \ \ \ | |/ / / |/| | | Pull images when doing podman create
| * | | Pull images when doing podman createDaniel J Walsh2020-04-20
| | |/ | |/| | | | | | | | | | | | | | | | | | | Currently podman create does not pull images if they don't exist. It should follow the pull policy specified by the user. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #5872 from jwhonce/wip/optionsOpenShift Merge Robot2020-04-20
|\ \ \ | |_|/ |/| | V2 Fix support for tcp://[::]<port> connections
| * | V2 Fix support for tcp://[::]<port> connectionsJhon Honce2020-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix support for socket activation, on remote and service $ systemd-socket-activate -l 8083 --fdname=podman bin/podman system service --log-level=debug --time=30 $ bin/podman-remote --remote=tcp://[::]:8083 image ls Or, use the podman.{socket,service} unit files $ bin/podman-remote --remote=unix:///run/podman/podman.sock image ls Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #5890 from sujil02/v2-pod-inspect-fixOpenShift Merge Robot2020-04-20
|\ \ \ | | | | | | | | Update pod inspect report to hold current pod status.
| * | | Update pod inspect report to hold current pod status.Sujil022020-04-20
| | |/ | |/| | | | | | | | | | | | | | | | Added status field in pod inspect report. Fixed pod tests to use it. Signed-off-by: Sujil02 <sushah@redhat.com>
* | | Merge pull request #5880 from abitrolly/patch-2OpenShift Merge Robot2020-04-20
|\ \ \ | |/ / |/| | Make `find` ignore dot files
| * | Make `find` ignore dot filesAnatoli Babenia2020-04-20
|/ / | | | | | | | | | | | | There is no need to search for sources in hidden dirs. In my case there are files from development environment that stand in the way. Signed-off-by: Anatoli Babenia <anatoli@rainforce.org>
* | Merge pull request #5733 from sujil02/v2-pod-pruneOpenShift Merge Robot2020-04-18
|\ \ | | | | | | Add pod prune for api v2
| * | Add pod prune for api v2.Sujil022020-04-17
| |/ | | | | | | | | | | | | | | Add the ability to prune pods for api v2, Includes the addition of force flag, for client side prompt. Update test suite to support this use case. Signed-off-by: Sujil02 <sushah@redhat.com>
* | Merge pull request #5871 from baude/v2t3OpenShift Merge Robot2020-04-18
|\ \ | |/ |/| enable integration testing
| * enable integration testingBrent Baude2020-04-17
| | | | | | | | Signed-off-by: Brent Baude <bbaude@redhat.com>
* | Merge pull request #5869 from rhatdan/userOpenShift Merge Robot2020-04-17
|\ \ | |/ |/| We were not handling the user option on create
| * We were not handling the user option on createDaniel J Walsh2020-04-17
| | | | | | | | | | | | With this patch we can get run_passwd_test.go to pass Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #5548 from kunalkushwaha/image-pruneOpenShift Merge Robot2020-04-17
|\ \ | |/ |/| image prune skips images with child images.
| * test case added for image prune cache imageKunal Kushwaha2020-04-15
| | | | | | | | | | | | | | test case added for skipping cache images and fixed condition in test case for prune dangling image Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
| * note for skipping cache image added.Kunal Kushwaha2020-04-15
| | | | | | | | Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
| * image prune skips images with child images.Kunal Kushwaha2020-04-15
| | | | | | | | | | | | | | | | While image build process, intermediate images are created. These images are also used as cache images, used in rebuilding same images. This fix the deletion of cache images. Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
* | Merge pull request #5868 from baude/v2t2OpenShift Merge Robot2020-04-17
|\ \ | | | | | | Fixes for system tests
| * | Fixes for system testsBrent Baude2020-04-17
| | | | | | | | | | | | | | | | | | Various fixes to protect against regressions in system tests Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #5819 from vrothberg/v2-buildOpenShift Merge Robot2020-04-17
|\ \ \ | |/ / |/| | podmanV2: implement build
| * | podmanV2: implement buildValentin Rothberg2020-04-17
| | | | | | | | | | | | | | | | | | | | | | | | Implement `podman build` for the local client. The remote client will require some rather large work in the backend and a new build endpoint for the libpod rest API. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #5866 from edsantiago/logformat_bats_summaryOpenShift Merge Robot2020-04-17
|\ \ \ | | | | | | | | Log formatter: add BATS summary line
| * | | Log formatter: add BATS summary lineEd Santiago2020-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BATS emits a summary line (number of tests passed/failed)... but only on a tty or when run with --pretty! In our CI context, with TAP output, it gives no end summary. Fix that. Keep track of 'ok', 'not ok', and 'skipped', and display the counts at the end. Also: add a regression test. You don't need to review or even read it: it's stark, and I'm not even enabling it for CI because it almost certainly won't run due to missing Perl library modules. It's just something I need on my end. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #5855 from baude/v2t1OpenShift Merge Robot2020-04-17
|\ \ \ \ | | | | | | | | | | Enable some testing
| * | | | Enable some testingBrent Baude2020-04-17
| |/ / / | | | | | | | | | | | | Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #5657 from AlbanBedel/network-name-fixOpenShift Merge Robot2020-04-17
|\ \ \ \ | |/ / / |/| | | Fix the pod name passed to cni
| * | | If possible use the pod name when creating a networkAlban Bedel2020-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a network we pass down a name which end up in the K8S_POD_NAME argument to cni plugins. Currently this name is always filled with the container name, so for pods it is the name of the infra container, not really what one would expect. This mess up with the dnsname plugin as it doesn't receive the pod name in K8S_POD_NAME. To fix this pass the pod name when the container is part of a pod, otherwise use the container name like before. Signed-off-by: Alban Bedel <albeu@free.fr> --- v2: Only call GetPod() when a pod id is set
* | | | Merge pull request #5856 from jwhonce/wip/optionsOpenShift Merge Robot2020-04-17
|\ \ \ \ | |_|/ / |/| | | Fix bug where two configurations had been created