summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Correctly identify the defaults for cgroup-managerDaniel J Walsh2019-06-15
| | | | | | | | | | | Currently we report cgroupmanager default as systemd, even if the user modified the libpod.conf. Also cgroupmanager does not work in rootless mode. This PR correctly identifies the default cgroup manager or reports it is not supported. Also add homeDir to correctly get the homedir if the $HOME is not set. Will attempt to get Homedir out of /etc/passwd. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #3094 from QiWang19/cpvolOpenShift Merge Robot2019-06-15
|\ | | | | podman copy files to the volume with a container
| * podman copy files to the volume with a containerQi Wang2019-06-03
| | | | | | | | | | | | | | enabls podman to cpoy files between the host machine and the volume related with a container. Close #3059 Signed-off-by: Qi Wang <qiwan@redhat.com>
* | Merge pull request #3278 from llchan/improve-prefix-handlingOpenShift Merge Robot2019-06-15
|\ \ | | | | | | Improve DESTDIR/PREFIX/ETCDIR handling
| * | Remove unnecessary var type to fix lint warningLawrence Chan2019-06-14
| | | | | | | | | | | | Signed-off-by: Lawrence Chan <element103@gmail.com>
| * | Move installPrefix and etcDir into runtime.goLawrence Chan2019-06-14
| | | | | | | | | | | | Signed-off-by: Lawrence Chan <element103@gmail.com>
| * | Improve DESTDIR/PREFIX/ETCDIR handlingLawrence Chan2019-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - PREFIX is now passed saved in the binary at build-time so that default paths match installation paths. - ETCDIR is also overridable in a similar way. - DESTDIR is now applied on top of PREFIX for install/uninstall steps. Previously, a DESTDIR=/foo PREFIX=/bar make would install into /bar, rather than /foo/bar. Signed-off-by: Lawrence Chan <element103@gmail.com>
* | | Merge pull request #3336 from TomSweeneyRedHat/dev/tsweeney/fixdocOpenShift Merge Robot2019-06-15
|\ \ \ | |/ / |/| | Change container command to contained
| * | Change container command to containedTomSweeneyRedHat2019-06-14
| | | | | | | | | | | | | | | | | | | | | | | | A quick follow up to #3306 to touch up two more 'container command' to 'contained command' to match the rest of the doc suite. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #3339 from mheon/bump-1.4.1Matthew Heon2019-06-14
|\ \ \ | | | | | | | | Bump to v1.4.1
| * | | Bump gitvalidation epochMatthew Heon2019-06-14
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | Bump to v1.4.2-devMatthew Heon2019-06-14
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | Bump to v1.4.1v1.4.1Matthew Heon2019-06-14
|/ / / | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #3328 from mheon/storage_opts_for_cleanupOpenShift Merge Robot2019-06-15
|\ \ \ | | | | | | | | When creating exit command, pass storage options on
| * | | Completely disable global options testMatthew Heon2019-06-14
| | | | | | | | | | | | | | | | | | | | | | | | We need to cut a release. We can investigate further next week. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Skip runlabel global options test for podman-in-podmanMatthew Heon2019-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is failing 100% on CI. No time to debug why properly before we need to cut a release, but is probably related to the change from a slice to an array. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Fix storage-opts type in CobraMatthew Heon2019-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StringSliceVar was distorting options. StringArrayVar seems to not mangle them, so use that instead. Thanks to Giuseppe for finding this one. Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | When creating exit command, pass storage options onMatthew Heon2019-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We made changes earlier that empty storage options when setting storage driver explicitly. Unfortunately, this breaks rootless cleanup commands, as they lose the fuse-overlayfs mount program path. Fix this by passing along the storage options to the cleanup process. Also, fix --syslog, which was broken a while ago (probably when we broke up main to add main_remote). Fixes #3326 Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #3337 from mheon/release_notes_1.4.1OpenShift Merge Robot2019-06-14
|\ \ \ \ | | | | | | | | | | Update release notes for 1.4.1
| * | | | Update release notes for 1.4.1Matthew Heon2019-06-14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #3330 from mheon/remote_storageOpenShift Merge Robot2019-06-14
|\ \ \ \ \ | | | | | | | | | | | | Add --storage flag to 'podman rm' (local only)
| * | | | | Add --storage flag to 'podman rm' (local only)Matthew Heon2019-06-13
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag switches to removing containers directly from c/storage and is mostly used to remove orphan containers. It's a superior solution to our former one, which attempted removal from storage under certain circumstances and could, under some conditions, not trigger. Also contains the beginning of support for storage in `ps` but wiring that in is going to be a much bigger pain. Fixes #3329. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #3334 from vrothberg/fix-3331OpenShift Merge Robot2019-06-14
|\ \ \ \ \ | |_|_|/ / |/| | | | pkg/apparmor: fix when AA is disabled
| * | | | pkg/apparmor: fix when AA is disabledValentin Rothberg2019-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to load the default profile when AppArmor is disabled on the host. Fixes: #3331 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #3333 from jordemort/podman-commit-env-fixOpenShift Merge Robot2019-06-14
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix ENV parsing on `podman import`
| * | | | Fix ENV parsing on `podman import`Jordan Webb2019-06-14
| |/ / / | | | | | | | | | | | | Signed-off-by: Jordan Webb <jordemort@github.com>
* | | | Merge pull request #3306 from rhatdan/exitOpenShift Merge Robot2019-06-14
|\ \ \ \ | | | | | | | | | | Document exit codes for podman exec
| * | | | Document exit codes for podman execDaniel J Walsh2019-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix podman run exit codes to show real messages when failures happen. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #3252 from mtrmac/registries.conf-mirrorsOpenShift Merge Robot2019-06-14
|\ \ \ \ \ | |_|/ / / |/| | | | Update containers/image to v2.0.0, and buildah to v1.8.4
| * | | | Use the logical registry location instead of the physical one in (podman info)Miloslav Trmač2019-06-14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | | | Update containers/image to v2.0.0, and buildah to v1.8.4Miloslav Trmač2019-06-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In c/image, this adds the the mirror-by-digest-only option to mirrors, and moves the search order to an independent list. A synchronized buildah update is necessary to deal with the c/image API change. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | Merge pull request #3320 from cevich/fix_ssh_raceOpenShift Merge Robot2019-06-14
|\ \ \ \ \ | | | | | | | | | | | | Cirrus: Guarantee ssh is running for rootless
| * | | | | Cirrus: Guarantee ssh is running for rootlessChris Evich2019-06-13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | Merge pull request #3315 from giuseppe/support-bind-nonrecursiveOpenShift Merge Robot2019-06-14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | storage: support --mount type=bind,bind-nonrecursive
| * | | | | storage: support --mount type=bind,bind-nonrecursiveGiuseppe Scrivano2019-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support for not recursive bind mounts. Closes: https://github.com/containers/libpod/issues/3314 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | storage: fix typoGiuseppe Scrivano2019-06-13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #3321 from haircommander/conmon-0.3.0OpenShift Merge Robot2019-06-14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | bump conmon to 0.3.0
| * | | | | Bump cirrus imagesPeter Hunt2019-06-13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | | | Bump conmon to 0.3.0Peter Hunt2019-06-13
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This enables cgroup v2 OOM Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | Merge pull request #3322 from mheon/fix_release_notesOpenShift Merge Robot2019-06-14
|\ \ \ \ \ | |_|_|/ / |/| | | | Update 1.4.0 release notes with ID -> Id in inspect
| * | | | Mention the new Podman mailing list in contributing.mdMatthew Heon2019-06-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | Update 1.4.0 release notes with ID -> Id in inspectMatthew Heon2019-06-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #3312 from mheon/podman_inspect_fixes_contOpenShift Merge Robot2019-06-13
|\ \ \ \ \ | | | | | | | | | | | | Further fixes for podman inspect
| * | | | | Split mount options in inspect furtherMatthew Heon2019-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker only uses Mode for :z/:Z, so move other options out into a new field. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | Make Inspect's mounts struct accurate to DockerMatthew Heon2019-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were formerly dumping spec.Mount structs, with no care as to whether it was user-generated or not - a relic of the very early days when we didn't know whether a user made a mount or not. Now that we do, match our output to Docker's dedicated mount struct. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | Provide OCI spec path in `podman inspect` outputMatthew Heon2019-06-12
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #3319 from mheon/purge_easyjsonOpenShift Merge Robot2019-06-13
|\ \ \ \ \ | |_|/ / / |/| | | | Purge all use of easyjson and ffjson in libpod
| * | | | Purge all use of easyjson and ffjson in libpodMatthew Heon2019-06-13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're no longer using either of these JSON libraries, dropped them in favor of jsoniter. We can't completely remove ffjson as c/storage uses it and can't easily migrate, but we can make sure that libpod itself isn't doing anything with them anymore. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3311 from giuseppe/oci-errorsOpenShift Merge Robot2019-06-13
|\ \ \ \ | |_|/ / |/| | | oci: use json formatted errors from the runtime
| * | | oci: allow to specify what runtimes support JSONGiuseppe Scrivano2019-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add a new configuration `runtime_supports_json` to list what OCI runtimes support the --log-format=json option. If the runtime is not listed here, libpod will redirect stdout/stderr from the runtime process. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>