summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Remove some unnecessary []byte to string conversionsSascha Grunert2020-08-03
| | | | | | | Some calls to `Sprintf("%s")` can be avoided by using direct string type assertions. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* Merge pull request #7141 from rhafer/image_descr_testOpenShift Merge Robot2020-08-03
|\ | | | | Add test case for description being present in search result
| * Make `search --no-trunc` work for podman remoteRalf Haferkamp2020-07-31
| | | | | | | | | | | | | | The HTTP API for image search was still lacking support of the NoTrunc parameter. Signed-off-by: Ralf Haferkamp <rhafer@suse.com>
| * API: Fix 'podman image search` missing descriptionRalf Haferkamp2020-07-31
| | | | | | | | | | | | | | | | | | `podman image search` returned wrong results for the image "Description" as it was mapped to the wrong field ("ID") in the search results. Basically cherry-picked into the api from commit cf5c63b5c492e41d72b6e3b6d75b5f39b0a957fd. Signed-off-by: Ralf Haferkamp <rhafer@suse.com>
| * Add test case for description being present in search resultRalf Haferkamp2020-07-31
| | | | | | | | | | | | | | Test for a specific static image and match the description to avoid regression like https://github.com/containers/podman/pull/7131 Signed-off-by: Ralf Haferkamp <rhafer@suse.com>
* | Merge pull request #7181 from Luap99/systemd-unit-pathOpenShift Merge Robot2020-08-02
|\ \ | | | | | | [CI:DOCS] Change recommended systemd unit path for root.
| * | Change recommended systemd unit path for root.Paul Holzinger2020-08-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `/usr/lib/systemd/system` should only be used by the package manager administrators should use: `/etc/systemd/system` or `/usr/local/lib/systemd/system` see: man systemd.unit Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #7171 from jwhonce/wip/varlink_timeoutOpenShift Merge Robot2020-08-01
|\ \ \ | | | | | | | | Fix podman service --valink timeout
| * | | Fix podman service --valink timeoutJhon Honce2020-07-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation and unit files call for a millisecond timeout while the code was using a second resolution. Code change is smaller given varlink has been deprecated. Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #7177 from mheon/there_can_be_only_oneOpenShift Merge Robot2020-08-01
|\ \ \ \ | | | | | | | | | | Ensure libpod/define does not include libpod/image
| * | | | Ensure libpod/define does not include libpod/imageMatthew Heon2020-07-31
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The define package under Libpod is intended to be an extremely minimal package, including constants and very little else. However, as a result of some legacy code, it was dragging in all of libpod/image (and, less significantly, the util package). Fortunately, this was just to ensure that error constants were not duplicating, and there's nothing preventing us from importing in the other direction and keeping libpod/define free of dependencies. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #7165 from jwhonce/issues/7008OpenShift Merge Robot2020-08-01
|\ \ \ \ | | | | | | | | | | Add versioned _ping endpoint
| * | | | Add versioned _ping endpointJhon Honce2020-07-31
| |/ / / | | | | | | | | | | | | | | | | | | | | Fixes #7008 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #7178 from mheon/update_master_204OpenShift Merge Robot2020-08-01
|\ \ \ \ | |_|/ / |/| | | [CI:DOCS] Update master README and release notes for v2.0.4
| * | | Update master README and release notes for v2.0.4Matthew Heon2020-07-31
| |/ / | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #7152 from Luap99/fix#7087OpenShift Merge Robot2020-07-31
|\ \ \ | |/ / |/| | fix pod creation with "new:" syntax
| * | fix pod creation with "new:" syntaxPaul Holzinger2020-07-31
|/ / | | | | | | | | | | | | | | | | | | | | When you execute podman create/run with the --pod new:<name> syntax the pod was created but the namespaces where not shared and therefore containers could not communicate over localhost. Add the default namespaces and pass the network options to the pod create options. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #7168 from QiWang19/exec-fdsOpenShift Merge Robot2020-07-31
|\ \ | |/ |/| Fix close fds of exec --preserve-fds
| * Fix close fds of exec --preserve-fdsQi Wang2020-07-31
| | | | | | | | | | | | Fix the closing of fds from --preserve-fds to avoid the operation on unrelated fds. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | Merge pull request #7120 from QiWang19/preserve-fdOpenShift Merge Robot2020-07-31
|\ \ | |/ |/| Fix close fds of run --preserve-fds
| * fix close fds of run --preserve-fdsQi Wang2020-07-30
| | | | | | | | | | | | | | Test flakes mentioned in #6987 might be caused by uncorrect closing of file descriptor. Fix the code to close file descriptors for podman run since it may close those used by other processes. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | Merge pull request #7164 from giuseppe/volumes-chown-no-recurseOpenShift Merge Robot2020-07-31
|\ \ | | | | | | volumes: do not recurse when chowning
| * | volumes: do not recurse when chowningGiuseppe Scrivano2020-07-31
| |/ | | | | | | | | | | | | | | | | keep the file ownership when chowning and honor the user namespace mappings. Closes: https://github.com/containers/podman/issues/7130 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #7162 from giuseppe/add-rootless-checksOpenShift Merge Robot2020-07-31
|\ \ | | | | | | rootless: do not ignore errors if mappings are specified
| * | rootless: add a check for the host id included in the rangeGiuseppe Scrivano2020-07-30
| | | | | | | | | | | | | | | | | | | | | add a check to verify whether the additional IDs also contain the host ID. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | rootless: child exits immediately on userns errorsGiuseppe Scrivano2020-07-30
| | | | | | | | | | | | | | | | | | | | | if the parent process failed to create the user namespace, let the child exit immediately. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | rootless: do not ignore errors if mappings are specifiedGiuseppe Scrivano2020-07-30
| |/ | | | | | | | | | | | | | | | | | | when setting up the user namespace do not ignore errors from newuidmap/newgidmap if there are mappings configured. The single user mapping is a fallback only when there are not mappings specified for the user. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #7159 from ashley-cui/runningforOpenShift Merge Robot2020-07-31
|\ \ | | | | | | add {{.RunningFor}} placeholder in ps --format
| * | add {{.RunningFor}} placeholder in ps --formatAshley Cui2020-07-30
| |/ | | | | | | | | | | For docker compatibility Signed-off-by: Ashley Cui <acui@redhat.com>
* | Merge pull request #7161 from Luap99/fix#7160OpenShift Merge Robot2020-07-30
|\ \ | |/ |/| fix swapped mem_usage/percent fields
| * fix swapped mem_usage/percent fieldsPaul Holzinger2020-07-30
|/ | | | | | Correct the wrong field assignment in `podman stats --format=json`. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* Merge pull request #7156 from zhangguanzhang/masterOpenShift Merge Robot2020-07-30
|\ | | | | fix podman system df format error
| * fix podman system df format errorzhangguanzhang2020-07-31
| | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | Merge pull request #7155 from mheon/fix_rmi_forceOpenShift Merge Robot2020-07-30
|\ \ | |/ |/| Ensure that 'rmi --force' evicts Podman containers
| * Ensure that 'rmi --force' evicts Podman containersMatthew Heon2020-07-30
|/ | | | | | | | | | | | | | | | | | | | | The logic for `podman rmi --force` includes a bit of code that will remove Libpod containers using Libpod's container removal logic - this ensures that they're cleanly and completely removed. For other containers (Buildah, CRI-O, etc) we fall back to manually removing the containers using the image from c/storage. Unfortunately, our logic for invoking the Podman removal function had an error, and it did not properly handle cases where we were force-removing an image with >1 name. Force-removing such images by ID guarantees their removal, not just an untag of a single name; our code for identifying whether to remove containers did not proper detect this case, so we fell through and deleted the Podman containers as storage containers, leaving traces of them in the Libpod DB. Fixes #7153 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* Merge pull request #7151 from edsantiago/batsOpenShift Merge Robot2020-07-30
|\ | | | | System tests: new system-df and passwd tests
| * System tests: new system-df and passwd testsEd Santiago2020-07-30
|/ | | | | | | | | | | | | | | | | | | | | | - New test for #6991 - passwd file is writable even when run with --userns=keep-id - Enable another keep-id test, commented out due to #6593 - New test for podman system df Also, independently, removed this line: apt-get -y upgrade conmon ...because it's causing CI failures, probably because of the boothole CVE, probably because the Ubuntu grub update was rushed out. I believe it is safe to remove this, because both Ubuntu 19 and 20 report: conmon is already the newest version (2.0.18~1). Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #7146 from rhatdan/formatOpenShift Merge Robot2020-07-30
|\ | | | | Don't crash when giving bogus format commands
| * Don't crash when giving bogus format commandsDaniel J Walsh2020-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if you give a bogus flag to --format it will crash the formatter. With this change we will get a nice error. podman images --format '{{ bogus }}' Error: template: list:1: function "bogus" not defined versus /bin/podman.old images --format '{{ bogus }}' panic: template: list:1: function "bogus" not defined goroutine 1 [running]: Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #7147 from rhatdan/historyOpenShift Merge Robot2020-07-29
|\ \ | | | | | | Return NamesHistory when returning remote images
| * | Return NamesHistory when returning remote imagesDaniel J Walsh2020-07-29
| |/ | | | | | | | | | | | | We are returning bogus data in podman-remote images --format json. This change will match the same data returned my podman images --format json. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #7074 from mheon/multi_ctrport_okOpenShift Merge Robot2020-07-29
|\ \ | | | | | | Binding the same container port to >1 host port is OK
| * | Binding the same container port to >1 host port is OKMatthew Heon2020-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial version of the new port code mistakenly restricted this, so un-restrict it. We still need to maintain the map of container ports, unfortunately (need to verify if the port in question is a duplicate, for example). Fixes #7062 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #7143 from edsantiago/skip_flaky_binding_testOpenShift Merge Robot2020-07-29
|\ \ \ | | | | | | | | bindings: skip flaky pause/unpause test
| * | | bindings: skip flaky pause/unpause testEd Santiago2020-07-29
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The "podman wait to pause|unpause condition" test is failing several times a day, always a flake. Issue #6518. Disable it until the cause can be identified and fixed. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #6991 from mheon/change_passwd_ondiskOpenShift Merge Robot2020-07-29
|\ \ \ | | | | | | | | Make changes to /etc/passwd on disk for non-read only
| * | | Make changes to /etc/passwd on disk for non-read onlyMatthew Heon2020-07-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bind-mounting /etc/passwd into the container is problematic becuase of how system utilities like `useradd` work. They want to make a copy and then rename to try to prevent breakage; this is, unfortunately, impossible when the file they want to rename is a bind mount. The current behavior is fine for read-only containers, though, because we expect useradd to fail in those cases. Instead of bind-mounting, we can edit /etc/passwd in the container's rootfs. This is kind of gross, because the change will show up in `podman diff` and similar tools, and will be included in images made by `podman commit`. However, it's a lot better than breaking important system tools. Fixes #6953 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #7142 from edsantiago/logformat_fix_gitcommitOpenShift Merge Robot2020-07-29
|\ \ \ \ | |_|/ / |/| | | logformatter: more libpod-podman fallout
| * | | logformatter: more libpod-podman falloutEd Santiago2020-07-29
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: formatted logs no longer have live links to sources in error-report lines. Cause: script was searching for '/libpod'. Solution: make it more flexible. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #7131 from rhafer/image_search_descrOpenShift Merge Robot2020-07-29
|\ \ \ | | | | | | | | Fix `podman image search` missing description