summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Prevent podman varlink socket fightChris Evich2019-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enabled, it's desired for the podman-varlink process to startup on boot or upon socket-activation, whichever happens first. However, with `KillMode=none` systemd will never kill any podman-varlink processes. This makes it easily possible for multiple podman-varlink processes to be running, and fight each other to service a single socket. --- For example: Prior to this commit, this will result in four podman-varlink processes being run: ``` systemctl enable io.podman.socket systemctl enable io.podman.service systemctl start io.podman.socket systemctl start io.podman.service systemctl start io.podman.service ``` Fix this by setting `KillMode=process` and `TimeoutStopSec=30` (default is 90). This results in podman-varlink exiting on its own after a minute of being idle (--timeout=60000). Alternatively, systemd will manage the service stop by sending a SIGTERM, then if podman-varlink has not exited within `TimeoutStopSec`, a SIGKILL will be sent. Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #4003 from TomSweeneyRedHat/dev/tsweeney/rootlessup2OpenShift Merge Robot2019-09-12
|\ | | | | Touch up some bad grammar in rootless doc
| * Touch up some bad grammar in rootless docTomSweeneyRedHat2019-09-12
|/ | | | | | | After my last update for the 'Shortcomings of Rootless Podman' was merged, I spotted a few grammatical nits that this corrects. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* Merge pull request #3994 from cevich/fix_img_build_seboolOpenShift Merge Robot2019-09-12
|\ | | | | Cirrus: Fix unnecessary setsebool
| * Cirrus: Fix unnecessary setseboolChris Evich2019-09-11
| | | | | | | | | | | | | | By mistake this was added to run for the image-building-VM and is not supported. Kill it. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #3968 from TomSweeneyRedHat/dev/tsweeney/rootlessupOpenShift Merge Robot2019-09-12
|\ \ | | | | | | Add cgroup v2 info to rootless tutorial
| * | Add cgroup v2 info to rootless tutorialTomSweeneyRedHat2019-09-11
| |/ | | | | | | | | | | | | | | | | Adding cgroup v2 information to the rootless tutorial. Will post it to a Google Doc to for easier review comments. https://docs.google.com/document/d/1hrxU-CYhrKDjMf6cIRuegbyY9pkDv-AlEF-i0I8_kdk Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | Merge pull request #3996 from rhatdan/trustOpenShift Merge Robot2019-09-12
|\ \ | |/ |/| podman-remote image trust is broken
| * podman-remote image trust is brokenDaniel J Walsh2019-09-11
|/ | | | | | We should not be making it available, it does nothing. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #3988 from mheon/fix_lookup_volumeOpenShift Merge Robot2019-09-11
|\ | | | | Volume lookup needs to include state to unmarshal into
| * Volume lookup needs to include state to unmarshal intoMatthew Heon2019-09-11
| | | | | | | | | | | | | | | | | | Lookup was written before volume states merged, but merged after, and CI didn't catch the obvious failure here. Without a valid state, we try to unmarshall into a null pointer, and 'volume rm' is completely broken because of it. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #3973 from baude/validateupdateOpenShift Merge Robot2019-09-11
|\ \ | |/ |/| add lint and manpage check to make validate
| * add lint and manpage check to make validatebaude2019-09-10
| | | | | | | | | | | | | | make validate now runs golangci-lint and the man-page-checker to ensure a PR is ready for our CI system. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #3984 from mheon/prune_no_in_use_errorOpenShift Merge Robot2019-09-11
|\ \ | | | | | | Do not prune images being used by a container
| * | Do not prune images being used by a containerMatthew Heon2019-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman is not the only user of containers/storage, and as such we cannot rely on our database as the sole source of truth when pruning images. If images do not show as in use from Podman's perspective, but subsequently fail to remove because they are being used by a container, they're probably being used by Buildah or another c/storage client. Since the images in question are in use, we shouldn't error on failure to prune them - we weren't supposed to prune them in the first place. Fixes: #3983 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #3927 from openSUSE/manager-annotationsOpenShift Merge Robot2019-09-11
|\ \ \ | | | | | | | | Add `ContainerManager` annotation to created containers
| * | | Add `ContainerManager` annotation to created containersSascha Grunert2019-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds the following annotation to every container created by podman: ```json "Annotations": { "io.containers.manager": "libpod" } ``` Target of this annotaions is to indicate which project in the containers ecosystem is the major manager of a container when applications share the same storage paths. This way projects can decide if they want to manipulate the container or not. For example, since CRI-O and podman are not using the same container library (libpod), CRI-O can skip podman containers and provide the end user more useful information. A corresponding end-to-end test has been adapted as well. Relates to: https://github.com/cri-o/cri-o/pull/2761 Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | Merge pull request #3581 from mheon/no_cgroupsOpenShift Merge Robot2019-09-11
|\ \ \ \ | | | | | | | | | | Support running containers without CGroups
| * | | | Add support for launching containers without CGroupsMatthew Heon2019-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly used with Systemd, which really wants to manage CGroups itself when managing containers via unit file. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #3961 from mheon/copy_volume_contentsOpenShift Merge Robot2019-09-10
|\ \ \ \ \ | |_|_|/ / |/| | | | When first mounting any named volume, copy up
| * | | | When first mounting any named volume, copy upMatthew Heon2019-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we only did this for volumes created at the same time as the container. However, this is not correct behavior - Docker does so for all named volumes, even those made with 'podman volume create' and mounted into a container later. Fixes #3945 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #3817 from xcffl/masterOpenShift Merge Robot2019-09-10
|\ \ \ \ \ | | | | | | | | | | | | Add explanation mounting named volumes for `podman run`
| * | | | | Replace "podman" with "Podman"xcffl2019-09-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: xcffl <xcffl@outlook.com>
| * | | | | Add instructions for mounting named volumesxcffl2019-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the host for `podman run` Signed-off-by: xcffl <xcffl@outlook.com>
| * | | | | Add instruction for using fuse-overlayfs as the rootless storage driverxcffl2019-09-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: xcffl <xcffl@outlook.com>
* | | | | | Merge pull request #3966 from cfelder/fixup-makefile-bsdOpenShift Merge Robot2019-09-10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixup Makefile for BSD systems, e.g. macOS
| * | | | | | Fixup Makefile for BSD systems, e.g. macOSChristian Felder2019-09-07
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bsd variant of `ln` does not support the ``-T`` option. Testing for existence using wildcard before creating new symlinks should be sufficient here. Furthermore the target directory is managed internally by this Makefile anyway. Signed-off-by: Christian Felder <c.felder@fz-juelich.de>
* | | | | | Merge pull request #3964 from TomSweeneyRedHat/dev/tsweeney/journaldimgfixOpenShift Merge Robot2019-09-10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Turn off journald in podmanimages on quay.io
| * | | | | Turn off journald in podmanimages on quay.ioTomSweeneyRedHat2019-09-06
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Dockerfiles that are used to build the podman images on quay.io, we were changing the events_logger from journald to file in libpod.conf, but we weren't enabling it as we didn't remove the comment. This corrects that and addresses: #3464 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | Merge pull request #3896 from mheon/volume_lookupOpenShift Merge Robot2019-09-09
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add ability to look up volumes by unambiguous partial name
| * | | | Add function for looking up volumes by partial nameMatthew Heon2019-09-09
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't included in Docker, but seems handy enough. Use the new API for 'volume rm' and 'volume inspect'. Fixes #3891 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3862 from baude/networkcreateOpenShift Merge Robot2019-09-09
|\ \ \ \ | | | | | | | | | | podman network create
| * | | | podman network createbaude2019-09-09
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | initial implementation of network create. we only support bridging networks with this first pass. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #3975 from edsantiago/man_page_checker_better_diagnosticsOpenShift Merge Robot2019-09-09
|\ \ \ \ | |_|/ / |/| | | hack/man_page_checker - improve diagnostics
| * | | hack/man_page_checker - improve diagnosticsEd Santiago2019-09-09
|/ / / | | | | | | | | | | | | | | | | | | | | | Make the errors more readable, with clearer instructions on what to look for, and which filename, and what we expect to see, and perhaps even how to approach a fix. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #3971 from cfelder/fixup-getconfighomedirOpenShift Merge Robot2019-09-09
|\ \ \ | | | | | | | | Fixup `util.GetRootlessConfigHomeDir` permission requirements
| * | | Fixup `util.GetRootlessConfigHomeDir` permission requirementsChristian Felder2019-09-09
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not require 0755 permissons for the ~/.config directory but require at least 0700 which should be sufficient. The current implementation internally creates this directory with 0755 if it does not exist, but if the directory already exists with different perissions the current code returns an empty string. Signed-off-by: Christian Felder <c.felder@fz-juelich.de>
* | | Merge pull request #3914 from marcov/units-optsOpenShift Merge Robot2019-09-09
|\ \ \ | | | | | | | | cli-flags: use a consistent format for <size><unit>
| * | | cli-flags: use a consistent format for <size><unit>Marco Vedovati2019-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a consistent format for description of the <size><unit> flags. Also, avoid backticks for /dev/shm, as that's interpreted as the format by the flag parsing lib. Signed-off-by: Marco Vedovati <mvedovati@suse.com>
* | | | Merge pull request #3944 from giuseppe/build-cgroup-managerOpenShift Merge Robot2019-09-08
|\ \ \ \ | | | | | | | | | | build: pass down the cgroup manager to buildah
| * | | | build: pass down the cgroup manager to buildahGiuseppe Scrivano2019-09-06
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Pass down the cgroup manager to use to buildah. Closes: https://github.com/containers/libpod/issues/3938 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #3965 from rhatdan/completionsOpenShift Merge Robot2019-09-08
|\ \ \ \ | |/ / / |/| | | Fix podman import bash completions
| * | | Fix podman import bash completionsDaniel J Walsh2019-09-07
|/ / / | | | | | | | | | | | | | | | | | | podman import bash completions are throwing errors. Updated this completion to work correctly. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #3950 from ashley-cui/macdocOpenShift Merge Robot2019-09-06
|\ \ \ | |_|/ |/| | mac_client docs
| * | mac_client.mdAshley Cui2019-09-06
| | | | | | | | | | | | | | | | | | add doc explaining setup for podman on mac in current stage of dev Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
* | | Merge pull request #3960 from mheon/ignore_umount_enoentOpenShift Merge Robot2019-09-06
|\ \ \ | | | | | | | | Ignore ENOENT on umount of SHM
| * | | Ignore ENOENT on umount of SHMMatthew Heon2019-09-06
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3918 from rhatdan/infoOpenShift Merge Robot2019-09-06
|\ \ \ \ | |/ / / |/| | | Return information about mount_program (fuse-overlayfs)
| * | | Return information about mount_program (fuse-overlayfs)Daniel J Walsh2019-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to get podman info to tell us about the version of the mount program to help us diagnose issues users are having. Also if in rootless mode and slirp4netns is installed reveal package info on slirp4netns. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #3958 from haircommander/play-kube-secOpenShift Merge Robot2019-09-06
|\ \ \ \ | | | | | | | | | | play kube: fix segfault