summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #2934 from haircommander/kube-fileOpenShift Merge Robot2019-04-16
|\ | | | | Add File mounts to play kube
| * Add File mounts to play kubePeter Hunt2019-04-15
| | | | | | | | | | | | Both File and FileOrCreate options are supported. Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | Merge pull request #2946 from baude/segsOpenShift Merge Robot2019-04-16
|\ \ | | | | | | Fix segfaults attribute to missing options
| * | Fix segfaults attribute to missing optionsbaude2019-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where the remote client culls options to a command, we need to be sure that the lookup for that flag does not result in a nil pointer. To do so, we add a Remote attribute to the podman struct and then cli helper funcs are now aware they are remote. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #2944 from mheon/fix_renumberOpenShift Merge Robot2019-04-15
|\ \ \ | | | | | | | | Call the runtime with WithRenumber() when asked by 'system renumber' command
| * | | Call the runtime with WithRenumber() when askedMatthew Heon2019-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We must have lost this at some point, rendering system renumber useless. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #2870 from rhatdan/changeOpenShift Merge Robot2019-04-15
|\ \ \ \ | | | | | | | | | | Validate ENV/LABEL Change options in varlink
| * | | | Validate ENV/LABEL Change options in varlinkDaniel J Walsh2019-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you pass in an invalid CHANGE ENV or LABEL option without the "=" character podman crashes. I see that there were other problems with the handling of commit --change handling. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #2939 from giuseppe/rootless-fixesOpenShift Merge Robot2019-04-15
|\ \ \ \ \ | |_|_|/ / |/| | | | rootless: cleanups
| * | | | cmd, pkg: drop commented codeGiuseppe Scrivano2019-04-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | pod: drop dead codeGiuseppe Scrivano2019-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we always create a user namespace now, so no need to check if we are running as non root. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | rootless, mount: not create namespaceGiuseppe Scrivano2019-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to check if we are able to mount the container as part of the mount command itself. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2921 from rhatdan/manOpenShift Merge Robot2019-04-15
|\ \ \ \ \ | |/ / / / |/| | | | Remove old crio reference from man pages
| * | | | Remove old crio reference from man pagesDaniel J Walsh2019-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems like we have some old references to crio man pages left over in the docs, since we don't mention crio in man pages we should not be referencing the man page in the see-also. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #2932 from haircommander/kube-envOpenShift Merge Robot2019-04-15
|\ \ \ \ \ | |_|_|_|/ |/| | | | Incorporate image and default environment variables in play kube
| * | | | Incorporate image and default environment variables in play kubePeter Hunt2019-04-14
|/ / / / | | | | | | | | | | | | | | | | | | | | Also put Environment variable parsing from image data into a helper function Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | Merge pull request #2928 from giuseppe/fix-umountOpenShift Merge Robot2019-04-14
|\ \ \ \ | | | | | | | | | | oci: fix umount of /sys/kernel
| * | | | oci: fix umount of /sys/kernelGiuseppe Scrivano2019-04-14
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | if the mount was already umounted as part of the cleanup (i.e. being a submount), the umount would fail. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #2927 from giuseppe/fix-tty-rootlessOpenShift Merge Robot2019-04-14
|\ \ \ \ | | | | | | | | | | Revert "rootless: set controlling terminal for podman in the userns"
| * | | | Revert "rootless: set controlling terminal for podman in the userns"Giuseppe Scrivano2019-04-14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 531514e8231e7f42efb7e7992d62e516f9577363. Closes: https://github.com/containers/libpod/issues/2926 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #2501 from mtrmac/fixed-hook-orderOpenShift Merge Robot2019-04-14
|\ \ \ \ | |_|_|/ |/| | | RFC: Make hooks sort order locale-independent
| * | | Re-run (make vendor) to drop the now unnecessary collation code and tablesMiloslav Trmač2019-04-09
| | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | Potentially breaking: Make hooks sort order locale-independentMiloslav Trmač2019-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't sort OCI hooks using the locale collation order; it does not make sense for the same system-wide directory to be interpreted differently depending on the user's LC_COLLATE setting, and the language-specific collation order can even change over time. Besides, the current collation order determination code has never worked with the most common LC_COLLATE values like en_US.UTF-8. Ideally, we would like to just order based on Unicode code points to be reliably stable, but the existing implementation is case-insensitive, so we are forced to rely on the unicode case mapping tables at least. (This gives up on canonicalization and width-insensitivity, potentially breaking users who rely on these previously documented properties.) Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | Merge pull request #2912 from adrianreber/labelOpenShift Merge Robot2019-04-14
|\ \ \ \ | |_|/ / |/| | | Use the same SELinux label for CRIU log files
| * | | Use the same SELinux label for CRIU log filesAdrian Reber2019-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SELinux label for the CRIU dump.log was explicitly set in Podman. The label for the restore.log, however, not. This just moves the code to label the log file into a function and calls that functions during checkpoint and restore. Signed-off-by: Adrian Reber <areber@redhat.com>
* | | | Merge pull request #2916 from vsoch/add/ubuntu-uidmap-installOpenShift Merge Robot2019-04-13
|\ \ \ \ | |_|_|/ |/| | | Adding uidmap to install steps for ubuntu
| * | | adding uidmap to install steps for ubuntuVanessa Sochat2019-04-12
| | | | | | | | | | | | | | | | Signed-off-by: Vanessa Sochat <vsochat@stanford.edu>
* | | | Merge pull request #2830 from baude/remotecheckpointOpenShift Merge Robot2019-04-13
|\ \ \ \ | | | | | | | | | | remote-client checkpoint/restore
| * | | | remote-client checkpoint/restorebaude2019-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the ability for the remote client to be able to checkpoint and restore containers. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #2915 from giuseppe/rootless-do-not-block-sigtstpOpenShift Merge Robot2019-04-13
|\ \ \ \ \ | | | | | | | | | | | | rootless: do not block SIGTSTP
| * | | | | rootless: do not block SIGTSTPGiuseppe Scrivano2019-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we were previously proxying all the signals, but doing that for SIGTSTP prevented the main process to be stopped by the tty. Closes: https://github.com/containers/libpod/issues/2775 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | rootless: set controlling terminal for podman in the usernsGiuseppe Scrivano2019-04-12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #2910 from giuseppe/fix-create-2-containersOpenShift Merge Robot2019-04-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | create: fix segfault if container name already exists
| * | | | | | create: fix segfault if container name already existsGiuseppe Scrivano2019-04-12
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not try to use ctr if there was an error. It fixes a segfault when there is already a container with the same name. regression introduced by: ba65301c955454e47c3893ca548f18a845a4c4a9 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #2911 from giuseppe/fix-pull-errorsOpenShift Merge Robot2019-04-12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | pull: fix a couple of issues
| * | | | | pull: exit with error if the image is not foundGiuseppe Scrivano2019-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://github.com/containers/libpod/issues/2785 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | pull: remove cryptic error messageGiuseppe Scrivano2019-04-12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we were printing something like: (0x1840f00,0xc00041bba0) Closes: https://github.com/containers/libpod/issues/2710 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2903 from baude/remotegenkubeOpenShift Merge Robot2019-04-12
|\ \ \ \ \ | | | | | | | | | | | | podman-remote generate kube
| * | | | | podman-remote generate kubebaude2019-04-12
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Allow the ability to generate kube YAML from the podman remote-client. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #2913 from mheon/get_instead_of_lookupOpenShift Merge Robot2019-04-12
|\ \ \ \ \ | |_|_|/ / |/| | | | Use GetContainer instead of LookupContainer for full ID
| * | | | Use GetContainer instead of LookupContainer for full IDMatthew Heon2019-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All IDs in libpod are stored as a full container ID. We can get a container by full ID faster with GetContainer (which directly retrieves) than LookupContainer (which finds a match, then retrieves). No reason to use Lookup when we have full IDs present and available. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #2907 from edsantiago/uidmap_test_fixOpenShift Merge Robot2019-04-12
|\ \ \ \ \ | |_|_|/ / |/| | | | new uidmap BATS test: fix
| * | | | new uidmap BATS test: fixEd Santiago2019-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various problems, one of which was causing the test to fail completely (otherwise I wouldn't have caught the others): - option is --uidmap, not --uidmapping - run_podman cannot be piped (| grep /sys/kernel). That's an unfortunate limitation of BATS. Any invocation of 'run' saves results to $output, which then has to be tested in a separate step. - do so, using 'run' and 'grep' and 'is' to produce readable messages on failure - remove "$expected_rc", that looks like a copy/paste bug from a few lines above. Skip entire test if rootless. (The one without --net=host passes, but it also passes with older podman as both root and rootless. I don't think it's actually testing anything, but agree with leaving it in to catch weird regressions). We really need to get these tests running in CI. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #2904 from rhatdan/rootlessOpenShift Merge Robot2019-04-11
|\ \ \ \ \ | | | | | | | | | | | | Fix README.md -> rootless.md link
| * | | | | Fix README.md -> rootless.md linkDaniel J Walsh2019-04-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #2889 from edsantiago/batsOpenShift Merge Robot2019-04-11
|\ \ \ \ \ \ | | | | | | | | | | | | | | BATS tests: start supporting podman-remote
| * | | | | | BATS tests: start supporting podman-remoteEd Santiago2019-04-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman-remote now supports rm! That's what we needed to start running BATS tests. Although most tests don't actually work, some do, and maybe the rest will start working over time. For now, disable them. The only significant difference found is that podman-remote strips fractional seconds from timestamps in JSON output. Probably not something worth caring about. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | | Merge pull request #2906 from vsoch/update/ubuntu-installOpenShift Merge Robot2019-04-11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | adding additional apt-get update, needed for ubuntu install
| * | | | | | adding additional update, needed for installVanessa Sochat2019-04-11
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Vanessa Sochat <vsochat@stanford.edu>
* | | | | | Merge pull request #2885 from kunalkushwaha/image-dangling-filter-fixOpenShift Merge Robot2019-04-11
|\ \ \ \ \ \ | | | | | | | | | | | | | | imagefilter dangling handling corrected