summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Added support to migrate containersAdrian Reber2019-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds an option to the checkpoint command to export a checkpoint into a tar.gz file as well as importing a checkpoint tar.gz file during restore. With all checkpoint artifacts in one file it is possible to easily transfer a checkpoint and thus enabling container migration in Podman. With the following steps it is possible to migrate a running container from one system (source) to another (destination). Source system: * podman container checkpoint -l -e /tmp/checkpoint.tar.gz * scp /tmp/checkpoint.tar.gz destination:/tmp Destination system: * podman pull 'container-image-as-on-source-system' * podman container restore -i /tmp/checkpoint.tar.gz The exported tar.gz file contains the checkpoint image as created by CRIU and a few additional JSON files describing the state of the checkpointed container. Now the container is running on the destination system with the same state just as during checkpointing. If the container is kept running on the source system with the checkpoint flag '-R', the result will be that the same container is running on two different hosts. Signed-off-by: Adrian Reber <areber@redhat.com>
* Added helper functions for container migrationAdrian Reber2019-06-03
| | | | | | | | This adds a couple of function in structure members needed in the next commit to make container migration actually work. This just splits of the function which are not modifying existing code. Signed-off-by: Adrian Reber <areber@redhat.com>
* Fix restore options help text and commentsAdrian Reber2019-06-03
| | | | Signed-off-by: Adrian Reber <areber@redhat.com>
* Merge pull request #3081 from baude/remotecommitOpenShift Merge Robot2019-06-03
|\ | | | | podman remote-client commit
| * podman remote-client commitbaude2019-05-30
| | | | | | | | | | | | | | add the ability to commit a container to an image using the remote client. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #3250 from marcusmueller/podman_man_page_mixupOpenShift Merge Robot2019-06-03
|\ \ | | | | | | Manpage: fix podman-varlink and -version mixup
| * | manpage: podman-tool table: un-confuse version and varlinkMarcus Müller2019-06-02
|/ / | | | | | | Signed-off-by: Marcus Müller <marcus@hostalia.de>
* | Merge pull request #3244 from giuseppe/cleanups-rootless-joinOpenShift Merge Robot2019-06-01
|\ \ | | | | | | rootless: some cleanups for rootless_linux.c
| * | rootless: use TEMP_FAILURE_RETRY macroGiuseppe Scrivano2019-05-31
| | | | | | | | | | | | | | | | | | avoid checking for EINTR for every syscall that could block. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | rootless: fix return typeGiuseppe Scrivano2019-05-31
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | rootless: make sure the buffer is NUL terminatedGiuseppe Scrivano2019-05-31
| | | | | | | | | | | | | | | | | | | | | after we read from the pause PID file, NUL terminate the buffer to avoid reading garbage from the stack. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #3236 from baude/testsplitrootlessOpenShift Merge Robot2019-06-01
|\ \ \ | |/ / |/| | split rootless local and remote testing
| * | split rootless local and remote testingbaude2019-05-31
| | | | | | | | | | | | Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #3246 from mheon/run_the_testsOpenShift Merge Robot2019-05-31
|\ \ \ | | | | | | | | Small fix to readme to force tests to run
| * | | Fix podman cp test by reordering operationsMatthew Heon2019-05-31
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Small fix to readme to force tests to runMatthew Heon2019-05-31
|/ / / | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #3227 from giuseppe/fix-warning-rootlessOpenShift Merge Robot2019-05-31
|\ \ \ | | | | | | | | rootless: skip check fo /etc/containers/registries.conf
| * | | rootless: skip check fo /etc/containers/registries.confGiuseppe Scrivano2019-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the warning can be confusing when used in rootless mode as the unprivileged user has no way for setting it up. Closes: https://github.com/containers/libpod/issues/2955 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #3224 from haraldh/varlink_upgradeOpenShift Merge Robot2019-05-31
|\ \ \ \ | | | | | | | | | | Fix for varlink upgrade connections
| * | | | Fix the varlink upgraded callsHarald Hoyer2019-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although an upgraded call is requested, the server has to send at least one reply (can be an error) and the client has to check the reply, before assuming an upgraded connection. Signed-off-by: Harald Hoyer <harald@redhat.com>
* | | | | Merge pull request #3238 from mheon/no_tmpcopyup_devOpenShift Merge Robot2019-05-31
|\ \ \ \ \ | | | | | | | | | | | | Do not set tmpcopyup on /dev
| * | | | | Do not set tmpcopyup on /devMatthew Heon2019-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3229 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | Merge pull request #3147 from baude/testimagecacheOpenShift Merge Robot2019-05-30
|\ \ \ \ \ \ | | | | | | | | | | | | | | use imagecaches for local tests
| * | | | | | use imagecaches for local testsbaude2019-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when doing localized tests (not varlink), we can use secondary image stores as read-only image caches. this cuts down on test time significantly because each test does not need to restore the images from a tarball anymore. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | | Merge pull request #3214 from mheon/resolve_symlinks_in_cpOpenShift Merge Robot2019-05-30
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Resolve symlinks in cp
| * | | | | | Fix podman cp testsMatthew Heon2019-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | | Error when trying to copy into a running rootless ctrMatthew Heon2019-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't pause them, so if that's requested, throw an error. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | | We can't pause rootless containers during cpMatthew Heon2019-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rootless containers can't be paused (no CGroups, so no freezer). We could try and emulate this with a SIGSTOP to all PIDs in the container, but that's inherently racy, so let's avoid it for now. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | | Fix bug in e2e tests for podman cpMatthew Heon2019-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | | Tolerate non-running containers in paused cpMatthew Heon2019-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | | Add test to ensure symlinks are resolved in ctr scopeMatthew Heon2019-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | | Add --pause to podman cp manpage and bash completionsMatthew Heon2019-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | | Pause containers while copying into themMatthew Heon2019-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should fix CVE-2018-15664 for Podman. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | | Use securejoin to merge paths in `podman cp`Matthew Heon2019-05-29
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Securejoin ensures that paths are resolved in the container, not on the host. Fixes #3211 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | Merge pull request #3235 from baude/testnoremoteinpodmanOpenShift Merge Robot2019-05-30
|\ \ \ \ \ \ | |/ / / / / |/| | | | | do not run remote tests inside container
| * | | | | do not run remote tests inside containerbaude2019-05-30
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when running the podman integration tests inside a container, we should not be running the remote tests. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #3230 from ashley-cui/dnsdocOpenShift Merge Robot2019-05-29
|\ \ \ \ \ | |/ / / / |/| | | | add dns flags to docs
| * | | | add dns flags to docsAshley Cui2019-05-29
| |/ / / | | | | | | | | | | | | | | | | | | | | Added same dns flags from buildah documentation to podman Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
* | | | Merge pull request #3221 from josegonzalez/masterOpenShift Merge Robot2019-05-29
|\ \ \ \ | | | | | | | | | | Add missing 'container cp' alias and document missing 'container update' command
| * | | | add missing container cp commandJose Diaz-Gonzalez2019-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docker cp' is an alias for 'docker container cp', and podman should have the equivalent alias. Signed-off-by: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
| * | | | document missing container update commandJose Diaz-Gonzalez2019-05-29
| | |/ / | |/| | | | | | | | | | | | | | | | | | Also reorder the missing update command to better match the container update command (it is in the same management namespace) Signed-off-by: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
* | | | Merge pull request #3228 from rhatdan/manOpenShift Merge Robot2019-05-29
|\ \ \ \ | | | | | | | | | | Podman logs man page shouldn't include timestamps
| * | | | Podman logs man page shouldn't include timestampsDaniel J Walsh2019-05-29
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Change man page to reflect default output. Commands with timestamps should include `-t` option. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #2709 from haircommander/journaldOpenShift Merge Robot2019-05-29
|\ \ \ \ | |_|_|/ |/| | | Add libpod journald logging
| * | | Add --follow to journald ctr loggingPeter Hunt2019-05-28
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | Address commentsPeter Hunt2019-05-28
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | Implement podman logs with log-driver journaldPeter Hunt2019-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a journald reader that translates the journald entry to a k8s-file formatted line, to be added as a log line Note: --follow with journald hasn't been implemented. It's going to be a larger undertaking that can wait. Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | bump go-systemd versionPeter Hunt2019-05-28
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | Added --log-driver and journald loggingPeter Hunt2019-05-28
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | Update completions and docs to use k8s file as log driverPeter Hunt2019-05-28
| | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-26 19:05:35 +0000