summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #4542 from mheon/static_ip_single_net_allowedOpenShift Merge Robot2019-11-26
|\ | | | | Allow --ip and --mac to be set when joining a CNI net
| * Allow --ip and --mac to be set when joining a CNI netMatthew Heon2019-11-26
| | | | | | | | | | | | | | | | | | | | These only conflict when joining more than one network. We can still set a single CNI network and set a static IP and/or static MAC. Fixes #4500 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #4475 from rhatdan/tmpdirOpenShift Merge Robot2019-11-26
|\ \ | | | | | | Add missing information to podman.1 man page
| * | Add missing information to podman.1 man pageDaniel J Walsh2019-11-08
| | | | | | | | | | | | | | | | | | | | | | | | Add missing options. Define the use of the TMPDIR environment variable for the storing of container images when they are being pulled to the system. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #4557 from rhatdan/manOpenShift Merge Robot2019-11-26
|\ \ \ | |_|/ |/| | Document other bind options on --volumes flag
| * | Document other bind options on --volumes flagDaniel J Walsh2019-11-26
|/ / | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #4514 from mheon/discard_cleanup_errorsOpenShift Merge Robot2019-11-26
|\ \ | | | | | | Discard errors from Shutdown in `system renumber`
| * | Discard errors from Shutdown in `system renumber`Matthew Heon2019-11-22
| | | | | | | | | | | | | | | | | | | | | | | | Every other Podman command discards errors from Shutdown, which will error if containers are running. Mirror that behavior, just ignore the errors. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #4540 from vrothberg/systemd-improvementsOpenShift Merge Robot2019-11-25
|\ \ \ | | | | | | | | podman rm/stop: add --allow-missing flag
| * | | podman {pod,} rm/stop: add --ignore flagValentin Rothberg2019-11-25
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an --ignore flag to podman rm and stop. When specified, Podman will ignore "no such {container,pod}" errors that occur when a specified container/pod is not present in the store (anymore). The motivation behind adding this flag is to write more robust systemd services using Podman. A user might have manually decided to remove a container/pod which would lead to a failure during the `ExecStop` directive of a systemd service referencing that container/pod. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #4544 from ↵OpenShift Merge Robot2019-11-22
|\ \ \ | |/ / |/| | | | | | | | containers/dependabot/go_modules/github.com/pkg/profile-1.4.0 build(deps): bump github.com/pkg/profile from 1.3.0 to 1.4.0
| * | build(deps): bump github.com/pkg/profile from 1.3.0 to 1.4.0dependabot-preview[bot]2019-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/pkg/profile](https://github.com/pkg/profile) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/pkg/profile/releases) - [Commits](https://github.com/pkg/profile/compare/v1.3.0...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #4539 from ↵OpenShift Merge Robot2019-11-22
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/gopkg.in/yaml.v2-2.2.7 build(deps): bump gopkg.in/yaml.v2 from 2.2.5 to 2.2.7
| * | | build(deps): bump gopkg.in/yaml.v2 from 2.2.5 to 2.2.7dependabot-preview[bot]2019-11-22
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.5 to 2.2.7. - [Release notes](https://github.com/go-yaml/yaml/releases) - [Commits](https://github.com/go-yaml/yaml/compare/v2.2.5...v2.2.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #4554 from vrothberg/prune-me-tender-prune-me-sweetOpenShift Merge Robot2019-11-22
|\ \ \ | | | | | | | | e2e/prune: run two top containers
| * | | e2e/prune: run two top containersValentin Rothberg2019-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In hope to make the prune tests more robust, run two top containers and stop one explicitly to reduce the risk of a race condition. Fixes: #4452 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #4512 from kunalkushwaha/prune-filterOpenShift Merge Robot2019-11-22
|\ \ \ \ | | | | | | | | | | image prune command fixed as per docker image prune.
| * | | | document updated for filter and until optionsKunal Kushwaha2019-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples of image prune with filter and until options added Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
| * | | | filter added to image pruge command.Kunal Kushwaha2019-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filter option accepts two filters. - label - until label supports "label=value" or "label=key=value" format until supports all golang compatible time/duration formats. Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
| * | | | timestamp related functions addedKunal Kushwaha2019-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timetype package include functions for calculating time input in string as one of golang duration format and calculate as unix timestamp Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
| * | | | warning added before image prune commandKunal Kushwaha2019-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning message added before executing image prune Added a force option, to execute without user input. Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
* | | | | Merge pull request #4528 from haircommander/kube-seccompOpenShift Merge Robot2019-11-22
|\ \ \ \ \ | | | | | | | | | | | | Handle seccomp annotations in play kube
| * | | | | play kube: handle seccomp labelsPeter Hunt2019-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add handling of seccomp annotations to play kube at both container and pod levels. also add a test Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | | Merge pull request #4538 from ↵OpenShift Merge Robot2019-11-22
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.14.0 build(deps): bump github.com/containers/storage from 1.13.5 to 1.14.0
| * | | | | build(deps): bump github.com/containers/storage from 1.13.5 to 1.14.0dependabot-preview[bot]2019-11-22
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.13.5 to 1.14.0. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.13.5...v1.14.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #4525 from rst0git/uns-restore-fixOpenShift Merge Robot2019-11-22
|\ \ \ \ \ | | | | | | | | | | | | container-restore: Fix restore with user namespace
| * | | | | container-restore: Fix restore with user namespaceRadostin Stoyanov2019-11-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restoring a container with user namespace, the user namespace is created by the OCI runtime, and the network namespace is created after the user namespace to ensure correct ownership. In this case PostConfigureNetNS will be set and the value of c.state.NetNS would be nil. Hence, the following error occurs: $ sudo podman run --name cr \ --uidmap 0:1000:500 \ -d docker.io/library/alpine \ /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done' $ sudo podman container checkpoint cr $ sudo podman container restore cr ... panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x30 pc=0x13a5e3c] Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
* | | | | | Merge pull request #4541 from giuseppe/use-file-backend-no-systemdOpenShift Merge Robot2019-11-21
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | config: use EventsLogger=file without systemd
| * | | | | config: use EventsLogger=file without systemdGiuseppe Scrivano2019-11-21
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | if systemd is not available, use the file events logger backend. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #4464 from TomSweeneyRedHat/dev/tsweeney/buildtestOpenShift Merge Robot2019-11-19
|\ \ \ \ \ | | | | | | | | | | | | Add new test suite for build
| * | | | | Add new test suite for buildTomSweeneyRedHat2019-11-16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most build testing should be done in Buildah's test suites, but we should have a minimal amount of tests, especially testing the parts that are different like layers and squash. Also the CLI argument handling of things like the context directory that we've had issues reported. This first chunk does a basic test and then checks for context directory being a file and squash iterations. More to be added as time goes by. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | Merge pull request #4523 from vrothberg/systemd-improvementsOpenShift Merge Robot2019-11-19
|\ \ \ \ \ | | | | | | | | | | | | podman rm/stop --cidfile
| * | | | | podman rm/stop --cidfileValentin Rothberg2019-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a --cidfile flag to podman rm/stop to pass a container ID via a file. Podman run already provides the functionaly to store the ID in a specified file which we now complete with rm/stop. This allows for a better life-cycle management in systemd services. Note that --cdifile can be specified multiple times to rm/stop. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | Merge pull request #4502 from vrothberg/fix-3359OpenShift Merge Robot2019-11-18
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | history: rewrite mappings
| * | | | | history: rewrite mappingsValentin Rothberg2019-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite the backend for displaying the history of an image to simplify the code and be closer to docker's behaviour. Instead of driving index-based heuristics, create a reverse mapping from top-layers to the corresponding image IDs and lookup the layers on-demand. Also use the uncompressed layer size to be closer to Docker's behaviour. Note that intermediate images from local builds are not considered for the ID lookups anymore. Fixes: #3359 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | Merge pull request #4521 from haircommander/winsz-fixOpenShift Merge Robot2019-11-17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Also delete winsz fifo
| * | | | | Also delete winsz fifoPeter Hunt2019-11-15
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | In conmon 2.0.3, we add another fifo to handle window resizing. This needs to be cleaned up for commands like restore, where the same path is used. Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | Merge pull request #4505 from vrothberg/archOpenShift Merge Robot2019-11-16
|\ \ \ \ \ | | | | | | | | | | | | container create: os/arch check
| * | | | | container create: os/arch checkValentin Rothberg2019-11-12
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless explicitely overridden, check if the image's OS and architecture and throw an errors in case of a mismatch. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #4368 from haircommander/pod-annotationsOpenShift Merge Robot2019-11-15
|\ \ \ \ \ | |_|/ / / |/| | | | Add pod annotations to container
| * | | | Add annotations in play kubePeter Hunt2019-11-08
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | | Add pod annotations to containerPeter Hunt2019-11-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have the annotations SandboxID, let's use them. This also allows kata containers to be created in pods and share a VM with the infra container. Note: as of now, this sharing only works if the pod has an infra container Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | Merge pull request #4518 from baude/alpinetopauseOpenShift Merge Robot2019-11-14
|\ \ \ \ \ | | | | | | | | | | | | use pause image for check all
| * | | | | use pause image for check allbaude2019-11-14
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the pull all tags test can frequently timeout when trying to pull all alpine tags. using the pause image, which is smaller, should provide some relief. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #4506 from TomSweeneyRedHat/dev/tsweeney/bump_buildah1.11.5OpenShift Merge Robot2019-11-13
|\ \ \ \ \ | | | | | | | | | | | | Bump to Buildah v1.11.5
| * | | | | Bump to Buildah v1.11.5TomSweeneyRedHat2019-11-13
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump to Buildah v1.11.5. Most notably changes to the podman build `--pull` functionality. `--pull=true` and `--pull=false` now work as Docker does, `--pull-never` added to supply the functionality of the old `--pull=false`. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | Merge pull request #4497 from onlyjob/masterOpenShift Merge Robot2019-11-13
|\ \ \ \ \ | | | | | | | | | | | | codespell: spelling corrections
| * | | | | codespell: spelling correctionsDmitry Smirnov2019-11-13
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
* | | | | Merge pull request #4503 from cevich/fix_branch_imagesOpenShift Merge Robot2019-11-13
|\ \ \ \ \ | |/ / / / |/| | | | Cirrus: Use branch-specific container tags
| * | | | Cirrus: Use branch-specific container tagsChris Evich2019-11-12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automated building of container images is handled in quay.io based on changes in the master branch of this repository. However, as additional branches are made, the "latest" image (from master) diverges from their expectations. Fix this by using the branch-tagged images built by quay. For the near-term, this also implies quay.io will be configured to also build different images for each branch, and tag them appropriately. Long-term, image build automation should be combined with libpod automation - to avoid needing to maintain automation in multiple systems/locations. Signed-off-by: Chris Evich <cevich@redhat.com>