summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #4319 from cevich/limit_releasesOpenShift Merge Robot2019-10-29
|\ | | | | Cirrus: Only upload tagged releases
| * Cirrus: Only upload tagged releasesChris Evich2019-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, every push to master had it's builds packaged and uploaded to google storage. This is a waste, since potential users are only ever concerned about tagged releases. Unfortunately because the release process involves humans with potentially multiple human and automation steps happening in parallel, it's easy for automation to not detect a tagged release, or trigger on development|pre-release tags. Fix this in `upload_release_archive.sh` using a new unit-tested function `is_release()`. This acts as the definitive authority on whether or not a specific commit rage or `$CIRRUS_TAG` value constitutes something worthy of upload. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #4366 from AkihiroSuda/fix-embed-versionOpenShift Merge Robot2019-10-29
|\ \ | | | | | | Makefile: fix embedding gitCommit
| * | Makefile: fix embedding gitCommitAkihiro Suda2019-10-29
| |/ | | | | | | Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
* | Merge pull request #3792 from haircommander/minimum-conmonOpenShift Merge Robot2019-10-29
|\ \ | |/ |/| require conmon v2.0.1
| * update conmon to v2.0.2 in in_podman imagePeter Hunt2019-10-28
| | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * bump cirrus imagesPeter Hunt2019-10-28
| | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * require conmon v2.0.1Peter Hunt2019-10-28
| | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * require conmon v2.0.0Peter Hunt2019-10-28
| | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | Merge pull request #4110 from mheon/fix_sigproxy_testsOpenShift Merge Robot2019-10-29
|\ \ | | | | | | Fix sig-proxy=false test and use image cache
| * | Fix sig-proxy=false test and use image cacheMatthew Heon2019-10-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulling fedora-minimal was potentially causing timeouts, which is bad. Using the cache avoids that. Sig-proxy=false test was entirely nonfunctional - I think we didn't update it when we fixed sig-proxy=true to be less racy. It was still passing, which is concerning. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #4360 from rhatdan/spellOpenShift Merge Robot2019-10-29
|\ \ \ | | | | | | | | Fix spelling mistakes
| * | | Fix spelling mistakesDaniel J Walsh2019-10-29
| | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #4187 from baude/dnspluginenableOpenShift Merge Robot2019-10-29
|\ \ \ \ | | | | | | | | | | enable dnsplugin for network create
| * | | | enable dnsplugin for network createbaude2019-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when users create a new network and the dnsname plugin can be found by podman, we will enable container name resolution on the new network. there is an option to opt *out* as well. tests cannot be added until we solve the packaging portion of the dnsname plugin. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #4356 from containers/vrothberg-staleOpenShift Merge Robot2019-10-29
|\ \ \ \ \ | | | | | | | | | | | | GitHub stale action
| * | | | | GitHub stale actionValentin Rothberg2019-10-28
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a GitHub action to mark issues and PRs as stale and to eventually close them after a grace period. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #4350 from giuseppe/slirp4netnslogOpenShift Merge Robot2019-10-29
|\ \ \ \ \ | |/ / / / |/| | | | libpod: if slirp4netns fails, return its stderr
| * | | | libpod: if slirp4netns fails, return its outputGiuseppe Scrivano2019-10-29
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read the slirp4netns stderr and propagate it in the error when the process fails. Replace: https://github.com/containers/libpod/pull/4338 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #4355 from mheon/ensure_stateOpenShift Merge Robot2019-10-28
|\ \ \ \ | | | | | | | | | | Add ensureState helper for checking container state
| * | | | Add ensureState helper for checking container stateMatthew Heon2019-10-28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a lot of checks for container state scattered throughout libpod. Many of these need to ensure the container is in one of a given set of states so an operation may safely proceed. Previously there was no set way of doing this, so we'd use unique boolean logic for each one. Introduce a helper to standardize state checks. Note that this is only intended to replace checks for multiple states. A simple check for one state (ContainerStateRunning, for example) should remain a straight equality, and not use this new helper. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #4331 from mheon/sane_rename_errorOpenShift Merge Robot2019-10-28
|\ \ \ \ | | | | | | | | | | Return a better error for volume name conflicts
| * | | | Return a better error for volume name conflictsMatthew Heon2019-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you try and create a new volume with the name of a volume that already exists, you presently get a thoroughly unhelpful error from `mkdir` as the volume attempts to create the directory it will be mounted at. An EEXIST out of mkdir is not particularly helpful to Podman users - it doesn't explain that the name is already taken by another volume. The solution here is potentially racy as the runtime is not locked, so someone else could take the name while we're still getting things set up, but that's a narrow timing window, and we will still return an error - just an error that's not as good as this one. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #4347 from tylarb/Warn_NoSuchCtrDaniel J Walsh2019-10-28
|\ \ \ \ \ | | | | | | | | | | | | Log warn instead of error for removing nonexistant container
| * | | | | Log warn instead of error for removing nonexistant containerTyler Ramer2019-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In event of a container removal that is no longer in database, log a warning instead of an error, as there is not any problem continuing execution. Resolves #4314 Signed-off-by: Tyler Ramer <tyaramer@gmail.com>
* | | | | | Merge pull request #4291 from baude/networkcreatecheckbridgeDaniel J Walsh2019-10-28
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | check existing bridge names when creating networks
| * | | | | check existing bridge names when creating networksbaude2019-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when creating a new networking, we should check existing networks for their bridge names and make sure the proposed new name is not part of this. reported by QE. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #4348 from rhatdan/manOpenShift Merge Robot2019-10-27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Cleanup man pages
| * | | | | | Cleanup man pagesDaniel J Walsh2019-10-25
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The format of the --network flags in man pages was all screwed up. This patch cleans this up. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #4345 from giuseppe/mask-release_agentOpenShift Merge Robot2019-10-26
|\ \ \ \ \ \ | |/ / / / / |/| | | | | systemd: mask /sys/fs/cgroup/systemd/release_agent
| * | | | | systemd: mask /sys/fs/cgroup/systemd/release_agentGiuseppe Scrivano2019-10-25
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when running in systemd mode on cgroups v1, make sure the /sys/fs/cgroup/systemd/release_agent is masked otherwise the container is able to modify it and execute scripts on the host. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #4342 from sshnaidm/docs_netOpenShift Merge Robot2019-10-25
|\ \ \ \ \ | | | | | | | | | | | | Add multiple networks explanation to docs
| * | | | | Add multiple networks explanation to docsSagi Shnaidman2019-10-24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
* | | | | | Merge pull request #4333 from giuseppe/error-rootless-cniOpenShift Merge Robot2019-10-24
|\ \ \ \ \ \ | |/ / / / / |/| | | | | rootless: raise an error with --network=
| * | | | | rootless: raise an error with --network=Giuseppe Scrivano2019-10-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://github.com/containers/libpod/issues/4332 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #4339 from baude/rtdfirstmenuOpenShift Merge Robot2019-10-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Initial dump of man pages and first menus
| * | | | | | Initial dump of man pages and first menusbaude2019-10-24
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #4330 from mheon/update_vol_create_docsOpenShift Merge Robot2019-10-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add documentation on options to volume create manpage
| * | | | | | Add documentation on options to volume create manpageMatthew Heon2019-10-23
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the rough equivalence between our option types and the various parts of the mount command. Amend examples a bit to cover this. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | Merge pull request #4228 from giuseppe/detect-no-systemd-sessionOpenShift Merge Robot2019-10-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | rootless: detect no system session with --cgroup-manager=systemd
| * | | | | | rootless: detect no system session with --cgroup-manager=systemdGiuseppe Scrivano2019-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the cgroup manager is set to systemd, detect if dbus is available, otherwise fallback to --cgroup-manager=cgroupfs. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | Merge pull request #4329 from mheon/no_noexec_image_volumeOpenShift Merge Robot2019-10-24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Image volumes should not be mounted noexec
| * | | | | | | Image volumes should not be mounted noexecMatthew Heon2019-10-23
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches Docker more closely, but retains the more important protections of nosuid/nodev. Fixes #4318 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | Merge pull request #4298 from mheon/uid_gid_optionsOpenShift Merge Robot2019-10-24
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Add parsing for UID, GID in volume "o" option
| * | | | | | Add parsing for UID, GID in volume "o" optionMatthew Heon2019-10-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everything else is a flag to mount, but "uid" and "gid" are not. We need to parse them out of "o" and handle them separately. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | Merge pull request #4322 from baude/rtdrequirementsOpenShift Merge Robot2019-10-23
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | add pip requirements file for rtd
| * | | | | | add pip requirements file for rtdbaude2019-10-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read the docs requires a pip requirements file to build markdown files instead of the rst format. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | | Merge pull request #4275 from vrothberg/fix-4274OpenShift Merge Robot2019-10-23
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | stats: list all running containers unless specified otherwise
| * | | | | | stats: list all running containers unless specified otherwiseValentin Rothberg2019-10-23
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless specified otherwise by --all, --latest or via arguments, list all running containers. This matches the behaviour of Docker and is also illustrated in the man pages where containers and options are marked to be optional. Fixes: #4274 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | Merge pull request #4321 from baude/readthedocsinitOpenShift Merge Robot2019-10-22
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Initial checking for readthedocs