summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #5923 from baude/mybadOpenShift Merge Robot2020-04-21
|\ | | | | my bad
| * my badBrent Baude2020-04-21
| | | | | | | | | | | | typos in previous pr are causing panics Signed-off-by: Brent Baude <bbaude@redhat.com>
* | Merge pull request #5900 from baude/v2cpOpenShift Merge Robot2020-04-21
|\ \ | |/ |/| podmanv2 cp
| * podmanv2 cpBrent Baude2020-04-21
| | | | | | | | | | | | enable podman to copy files between container and host, local mode only. this is a straight port of v1 code to v2. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | Merge pull request #5921 from baude/v2imageepOpenShift Merge Robot2020-04-21
|\ \ | | | | | | add entrypoint from image where needed
| * | add entrypoint from image where neededBrent Baude2020-04-21
| | | | | | | | | | | | | | | | | | if the image specifies both the image and entrypoint, we need to account for that and preprend the entrypoint to the command. this only happens if no user command and entrypoint were supplied. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #5920 from edsantiago/chcon_podman_remoteOpenShift Merge Robot2020-04-21
|\ \ \ | | | | | | | | Makefile: fix broken chcon for podman-remote
| * | | Makefile: fix broken chcon for podman-remoteEd Santiago2020-04-21
| |/ / | | | | | | | | | | | | | | | | | | The install.remote target looks like it was copy-pasted from install.bin and missed a spot. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #5912 from giuseppe/v2-rlimitsOpenShift Merge Robot2020-04-21
|\ \ \ | |_|/ |/| | v2, pkg: implement rlimits
| * | pkg: implement rlimitsGiuseppe Scrivano2020-04-21
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #5908 from baude/v2subsOpenShift Merge Robot2020-04-21
|\ \ \ | | | | | | | | podmanv2 container subcommands
| * | | podmanv2 container subcommandsBrent Baude2020-04-21
| | |/ | |/| | | | | | | | | | | | | add container subcommands with example text that has proper context. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #5902 from baude/v2portOpenShift Merge Robot2020-04-21
|\ \ \ | |/ / |/| | v2podman port
| * | v2podman portBrent Baude2020-04-21
|/ / | | | | | | | | | | add port command to podman. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | Merge pull request #5910 from abitrolly/shared-depsOpenShift Merge Robot2020-04-21
|\ \ | | | | | | Move Fedora 31 dependencies for building podman into separate file
| * | Move Fedora dependencies for building podman into separate fileAnatoli Babenia2020-04-21
| |/ | | | | | | | | | | This ones listed here are actual for Fedora 31. Signed-off-by: Anatoli Babenia <anatoli@rainforce.org>
* | Merge pull request #5913 from rhatdan/v2OpenShift Merge Robot2020-04-21
|\ \ | | | | | | More fixes for podman create tests
| * | Handle annotations passed in via the clientDaniel J Walsh2020-04-21
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | Need to set the EntrypointDaniel J Walsh2020-04-21
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | Fix podman inspect to return errors on failureDaniel J Walsh2020-04-21
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #5647 from rhatdan/containers.confOpenShift Merge Robot2020-04-21
|\ \ \ | |/ / |/| | Update podmanV2 to use containers.conf
| * | Add support for containers.conf to podmanimagesDaniel J Walsh2020-04-20
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | Update podman to use containers.confDaniel J Walsh2020-04-20
| | | | | | | | | | | | | | | | | | | | | | | | Add more default options parsing Switch to using --time as opposed to --timeout to better match Docker. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | 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>