aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* cmd, docs, test: fix some typosGiuseppe Scrivano2019-06-18
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Merge pull request #3338 from jwhonce/issue/3299OpenShift Merge Robot2019-06-18
|\ | | | | Add remote client log to file
| * Add remote client logging to a fileJhon Honce2019-06-17
| | | | | | | | | | | | | | | | | | | | Logging messages from the dependency libraries should not log onto the screen when using the remote client. This patch writes logging to ~/.config/containers/podman-remote.log Fixes #3299 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #2947 from edsantiago/bats_in_cirrusOpenShift Merge Robot2019-06-17
|\ \ | | | | | | run BATS tests in Cirrus
| * | run BATS tests in CirrusEd Santiago2019-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm running the BATS tests manually once in a while, and catching several problems each week that make it past the rest of CI. Since the BATS tests run at RPM gating time, we need to catch problems earlier. Try running the tests from Cirrus. Tests will be skipped on Ubuntu due to a too-ancient version of coreutils (8.28; the 'timeout -v' we use requires 8.29). Tests are run *after* integration tests, even though these take three minutes and would be nice to have fail quickly, because running before causes bizarre CI failures. Shrug. UPDATE: also fix run test, broken by #3311. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #3257 from weirdwiz/loadOpenShift Merge Robot2019-06-17
|\ \ \ | |/ / |/| | Add warning while untagging an image podman-load
| * | Add warning while untagging an image podman-loadDivyansh Kamboj2019-06-04
| | | | | | | | | | | | Signed-off-by: Divyansh Kamboj <kambojdivyansh2000@gmail.com>
* | | Merge pull request #3308 from cevich/always_collect_logsOpenShift Merge Robot2019-06-17
|\ \ \ | | | | | | | | Cirrus: Simplify log collection commands
| * | | Cirrus: Simplify log collection commandsChris Evich2019-06-14
| | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #3297 from rhatdan/systemdOpenShift Merge Robot2019-06-17
|\ \ \ \ | | | | | | | | | | Accidently removed /run/lock from systemd mounts
| * | | | Accidently removed /run/lock from systemd mountsDaniel J Walsh2019-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is blowing up systemd containers on Ubuntu. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #3296 from arkamar/typosOpenShift Merge Robot2019-06-17
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix some typos in few *.md files
| * | | | API.md: fix few typosPetr Vaněk2019-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Appropriate changes were applied to the file cmd/podman/varlink/io.podman.varlink, in order to make changes in API.md persistent. Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
| * | | | docs/podamn.1.md: fix typo: remove double thePetr Vaněk2019-06-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
| * | | | CONTRIBUTING.md: fix typoPetr Vaněk2019-06-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
* | | | | Merge pull request #3349 from sshnaidm/masterOpenShift Merge Robot2019-06-17
|\ \ \ \ \ | | | | | | | | | | | | Fix subgidname option in docs for podman run
| * | | | | Fix subgidname option in docs for podman runSagi Shnaidman2019-06-17
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
* | | | | Merge pull request #3347 from giuseppe/add-test-for-logs-fOpenShift Merge Robot2019-06-17
|\ \ \ \ \ | | | | | | | | | | | | test: add test for logs -f
| * | | | | test: add test for logs -fGiuseppe Scrivano2019-06-17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discussion here: https://github.com/containers/libpod/issues/3325#issuecomment-502214492 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #3348 from vrothberg/kill-errorOpenShift Merge Robot2019-06-17
|\ \ \ \ \ | |/ / / / |/| | | | kill: print ID and state for non-running containers
| * | | | stop/kill: inproper state errors: s/in state/is in state/Valentin Rothberg2019-06-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | kill: print ID and state for non-running containersValentin Rothberg2019-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend kill's error message to include the container's ID and state. This address cases where error messages caused by other containers may confuse users. Signed-off-by: Valentin Rothberg <rothberg@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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-26 08:06:40 +0000