summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #3240 from rhatdan/storageoptsOpenShift Merge Robot2019-06-10
|\ | | | | When you change the storage driver we ignore the storage-options
| * When you change the storage driver we ignore the storage-optionsDaniel J Walsh2019-06-08
| | | | | | | | | | | | | | | | | | | | | | The storage driver and the storage options in storage.conf should match, but if you change the storage driver via the command line then we need to nil out the default storage options from storage.conf. If the user wants to change the storage driver and use storage options, they need to specify them on the command line. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * Update vendor on containers/storage to v1.12.10Daniel J Walsh2019-06-08
| | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #3283 from haircommander/logging-play-kube-hotfixOpenShift Merge Robot2019-06-10
|\ \ | | | | | | Set a default log driver if none is specified
| * | only set log driver if it isn't emptyPeter Hunt2019-06-08
| | | | | | | | | | | | | | | | | | Now, not setting a log driver in a create config correctly takes the default (k8s-logging) Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | Merge pull request #3254 from ashley-cui/standarddocOpenShift Merge Robot2019-06-10
|\ \ \ | | | | | | | | Standardize Documentation
| * | | standardize documentation formattingAshley Cui2019-06-10
| | | | | | | | | | | | | | | | Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
* | | | Merge pull request #3237 from cevich/ci_contrib_docOpenShift Merge Robot2019-06-10
|\ \ \ \ | | | | | | | | | | docs: Add CI section and links
| * | | | docs: Add CI section and linksChris Evich2019-05-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #3287 from TomSweeneyRedHat/dev/tsweeney/podmanimage3OpenShift Merge Robot2019-06-10
|\ \ \ \ \ | | | | | | | | | | | | Touchup upstream Dockerfile
| * | | | | Touchup upstream DockerfileTomSweeneyRedHat2019-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upstream/Dockerfile had a few issues that this cleans up. A few files were misplaced, wrong installs and removes. This corrects those issues. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | | Merge pull request #3285 from CameronNemo/muslOpenShift Merge Robot2019-06-09
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix cgo includes for musl
| * | | | | Fix cgo includes for muslCameron Nemo2019-06-08
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | closes #3284 Signed-off-by: Cameron Nemo <cnemo@tutanota.com>
* | | | | Merge pull request #3180 from mheon/inspect_volumesOpenShift Merge Robot2019-06-08
|\ \ \ \ \ | |_|_|/ / |/| | | | Begin to break up pkg/inspect
| * | | | Begin to break up pkg/inspectMatthew Heon2019-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's put inspect structs where they're actually being used. We originally made pkg/inspect to solve circular import issues. There are no more circular import issues. Image structs remain for now, I'm focusing on container inspect. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #3213 from juhp/patch-1OpenShift Merge Robot2019-06-08
|\ \ \ \ \ | | | | | | | | | | | | fix tutorial link to install.md
| * | | | | fix tutorial link to install.mdJens Petersen2019-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [skip ci] Signed-off-by: Jens Petersen <petersen@redhat.com>
* | | | | | Merge pull request #3253 from cevich/clean_brent_messOpenShift Merge Robot2019-06-08
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Cirrus: Minor cleanup of dependencies and docs
| * | | | | Cirrus: Minor cleanup of dependencies and docsChris Evich2019-06-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | Merge pull request #3276 from jwakely/patch-1OpenShift Merge Robot2019-06-07
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix spelling
| * | | | | | Fix spellingJonathan Wakely2019-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
* | | | | | | Merge pull request #3279 from mheon/update_cstorageOpenShift Merge Robot2019-06-07
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update c/storage to 9b10041d7b2ef767ce9c42b5862b6c51eeb82214
| * | | | | | | Default 'pause' to false for 'podman cp'Matthew Heon2019-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | | | Update c/storage to 9b10041d7b2ef767ce9c42b5862b6c51eeb82214Matthew Heon2019-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | | Merge pull request #3282 from mheon/bump-1.4.0Matthew Heon2019-06-07
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump to v1.4.0
| * | | | | | | | Bump gitvalidation epochMatthew Heon2019-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | | | | | Bump to v1.4.1-devMatthew Heon2019-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | | | | | Bump to v1.4.0v1.4.0Matthew Heon2019-06-07
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | | | | Merge pull request #3281 from mheon/release_notes_1.4.0_realMatthew Heon2019-06-07
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update release notes for v1.4.0
| * | | | | | | | Update release notes for v1.4.0Matthew Heon2019-06-07
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | | Merge pull request #3280 from mheon/release_notes_1.4.0Matthew Heon2019-06-07
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update release notes for v1.4.0
| * | | | | | | Update release notes for v1.4.0Matthew Heon2019-06-07
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | Merge pull request #3271 from ↵OpenShift Merge Robot2019-06-07
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | giuseppe/rootless-skip-ns-resolution-on-old-kernels rootless: skip NS_GET_PARENT on old kernels
| * | | | | | | rootless: skip NS_GET_PARENT on old kernelsGiuseppe Scrivano2019-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on old kernels the ioctl NS_GET_PARENT is not available. Handle the error code and immediately return the same fd. It should be fine now that we use the namespace resolution using the conmon pid, so the namespace parent resolution is just a safety measure. Closes: https://github.com/containers/libpod/issues/2968 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | Merge pull request #2272 from adrianreber/migrationOpenShift Merge Robot2019-06-07
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Add support to migrate containers
| * | | | | | | migration: add possibility to restore a container with a new nameAdrian Reber2019-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option to restore a container from an external checkpoint archive (podman container restore -i /tmp/checkpoint.tar.gz) restores a container with the same name and same ID as id had before checkpointing. This commit adds the option '--name,-n' to 'podman container restore'. With this option the restored container gets the name specified after '--name,-n' and a new ID. This way it is possible to restore one container multiple times. If a container is restored with a new name Podman will not try to request the same IP address for the container as it had during checkpointing. This implicitly assumes that if a container is restored from a checkpoint archive with a different name, that it will be restored multiple times and restoring a container multiple times with the same IP address will fail as each IP address can only be used once. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | | Also download container images during restoreAdrian Reber2019-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If restoring a container from a checkpoint it was necessary that the image the container is based was already available (podman pull). This commit adds the image download to podman container restore if it does not exist. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | | Include container migration into tutorialAdrian Reber2019-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | | Add man-pages for container migrationAdrian Reber2019-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | | Added bash completion for container migrationAdrian Reber2019-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | | Add test case for container migrationAdrian Reber2019-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The difference between container checkpoint/restore and container migration is that for migration the container which was checkpointed must not exist during restore. To simulate migration the container is remove ('podman rm -fa') before being restored. The migration test does following steps: * podman run * podman container checkpoint -l -e /tmp/checkpoint.tar.gz * podman rm -fa * podman container restore -i /tmp/checkpoint.tar.gz Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | | 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 #3268 from cevich/meta_track_repoOpenShift Merge Robot2019-06-06
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Cirrus: Track VM Image calling GCE project
| * | | | | | | Cirrus: Track VM Image calling GCE projectChris Evich2019-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With multiple `containers` projects updating VM Image metadata, it would be very difficult to discover which Cirrus-CI setup was responsible. Add the GCE project name to the list of metadata labels to update when this container runs. This will give more context as to which images are currently in use. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | | | Merge pull request #3272 from mheon/skip_hc_flakeOpenShift Merge Robot2019-06-06
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Disable a very badly flaking healthcheck test
| * | | | | | | Disable a very badly flaking healthcheck testMatthew Heon2019-06-06
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll reenable once the flake is fixed. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | Merge pull request #3256 from llchan/rootless-init-pathOpenShift Merge Robot2019-06-05
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Inherit rootless init_path from system libpod.conf
| * | | | | | Inherit rootless init_path from system libpod.confLawrence Chan2019-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lawrence Chan <element103@gmail.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-07 13:11:43 +0000