summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #9439 from vrothberg/3.0-vendor-imageOpenShift Merge Robot2021-02-19
|\ | | | | [3.0] vendor c/image v5.10.3
| * vendor c/image v5.10.3Valentin Rothberg2021-02-19
| | | | | | | | | | | | * place shortnames in ~/.cache not ~/.config/.cache Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #9435 from vrothberg/3.0-cp-content-fixOpenShift Merge Robot2021-02-19
|\ \ | |/ |/| [3.0] cp: treat "." and "/." correctly
| * cp: treat "." and "/." correctlyValentin Rothberg2021-02-19
|/ | | | | | | | | | | | Make sure to treat "." and "/." correctly. Both cases imply to copy the contents of a directory in contrast to the directory. This implies to unset the KeepDirectoryNames options of the copiah package. Previously, the code was performing a simple string suffix check which is not enough since it would match files and directories ending with ".". Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #9427 from mheon/bump_301OpenShift Merge Robot2021-02-18
|\ | | | | Bump to v3.0.1
| * Bump to v3.0.2-devMatthew Heon2021-02-18
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Bump to v3.0.1v3.0.1Matthew Heon2021-02-18
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Final 3.0.1 release notes updateMatthew Heon2021-02-18
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Bump containers/buildah to v1.19.4Daniel J Walsh2021-02-18
| | | | | | | | | | | | Fix handling of --iidfile to happen on the client side. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * Implement missing arguments for podman buildDaniel J Walsh2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | Buildah bud passes a bunch more flags then podman build. We need to implement hook up all of these flags to get full functionality. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> <MH: Fix cherry pick conflicts> Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Fix swagger generationMatthew Heon2021-02-18
| | | | | | | | | | | | The InspectVolumeData struct was moved into Define from Libpod. Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Updated Buildah to v1.19.4Matthew Heon2021-02-18
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Add release notes for v3.0.1Matthew Heon2021-02-18
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Don't switch on a single caseNikolay Edigaryev2021-02-18
| | | | | | | | Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
| * Quote URLNikolay Edigaryev2021-02-18
| | | | | | | | Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
| * bindings: support simple types that implement fmt.Stringer interfaceNikolay Edigaryev2021-02-18
| | | | | | | | Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
| * API: fix libpod's container wait endpoint condition conversionNikolay Edigaryev2021-02-18
| | | | | | | | Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
| * Do not reset storage when running inside of a containerDaniel J Walsh2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if the host shares container storage with a container running podman, the podman inside of the container resets the storage on the host. This can cause issues on the host, as well as causes the podman command running the container, to fail to unmount /dev/shm. podman run -ti --rm --privileged -v /var/lib/containers:/var/lib/containers quay.io/podman/stable podman run alpine echo hello * unlinkat /var/lib/containers/storage/overlay-containers/a7f3c9deb0656f8de1d107e7ddff2d3c3c279c11c1635f233a0bffb16051fb2c/userdata/shm: device or resource busy * unlinkat /var/lib/containers/storage/overlay-containers/a7f3c9deb0656f8de1d107e7ddff2d3c3c279c11c1635f233a0bffb16051fb2c/userdata/shm: device or resource busy Since podman is volume mounting in the graphroot, it will add a flag to /run/.containerenv to tell podman inside of container whether to reset storage or not. Since the inner podman is running inside of the container, no reason to assume this is a fresh reboot, so if "container" environment variable is set then skip reset of storage. Also added tests to make sure /run/.containerenv is runnig correctly. Fixes: https://github.com/containers/podman/issues/9191 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> <MH: Fixed cherry-pick conflicts> Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Add missing early returns in compat APIRiyad Preukschas2021-02-18
| | | | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: Riyad Preukschas <riyad@informatik.uni-bremen.de> <MH: Fixed cherry-pick conflicts> Signed-off-by: Matthew Heon <mheon@redhat.com>
| * [NO TESTS NEEDED] Refactor generated codeMatej Vasek2021-02-18
| | | | | | | | | | | | | | | | Extracted common functionality to util function. Signed-off-by: Matej Vasek <mvasek@redhat.com> <MH: Fixed cherry-pick conflicts>
| * Enable more golangci-lint lintersPaul Holzinger2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup the golangci.yml file and enable more linters. `pkg/spec` and `iopodman.io` is history. The vendor directory is excluded by default. The dependencies dir was listed twice. Fix the reported problems in `pkg/specgen` because that was also excluded by `pkg/spec`. Enable the structcheck, typecheck, varcheck, deadcode and depguard linters. [NO TESTS NEEDED] Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
| * Enable whitespace linterPaul Holzinger2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | Use the whitespace linter and fix the reported problems. [NO TESTS NEEDED] Signed-off-by: Paul Holzinger <paul.holzinger@web.de> <MH: Fixed up cherry-pick conflicts> Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Enable golint linterPaul Holzinger2021-02-18
| | | | | | | | | | | | | | | | Use the golint linter and fix the reported problems. [NO TESTS NEEDED] Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
| * Enable stylecheck linterPaul Holzinger2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | Use the stylecheck linter and fix the reported problems. [NO TESTS NEEDED] Signed-off-by: Paul Holzinger <paul.holzinger@web.de> <MH: Fix cherry-pick conflict> Signed-off-by: Matthew Heon <mheon@redhat.com>
| * [NO TESTS NEEDED] Update linterMatej Vasek2021-02-18
| | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * apiv2: handle docker-java clients pullingIgor Korolev2021-02-18
| | | | | | | | | | | | | | | | | | When docker-java calls images/create?fromImage=x, it expects two things for a successful response: that both "error" and "errorDetail" are not set, and that the "progress" message contains one of five hard-coded strings ("Download complete" being one of them). Signed-off-by: Igor Korolev <missterr@gmail.com>
| * Fix superfluous response.WriteHeader call in WaitContainerLibpod()Nikolay Edigaryev2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the query decoding fails at the beginning of WaitContainerLibpod(), the Error() sets the header but doesn't returns after that. This causes the execution flow to reach the WriteResponse() at the end of WaitContainerLibpod(), which attempts to set another header, thus causing the following error: http: superfluous response.WriteHeader call from github.com/containers/podman/pkg/api/handlers/utils.WriteResponse (handler.go:124) [NO TESTS NEEDED] Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
| * fix dns resolution on ubuntubaude2021-02-18
| | | | | | | | | | | | ubuntu's dns seems a little odd and requires a fq name in its tests. Signed-off-by: baude <bbaude@redhat.com>
| * e2e: fix network alias testValentin Rothberg2021-02-18
| | | | | | | | | | | | | | | | | | | | | | The logic in the e2e test for multiple network aliases is indicating the test should wait for the containerized nginx to be ready. As this may take some time, the test does an exponential backoff starting at 2050ms. Fix the logic by removing the `Expect(...)` call during the exponential backoff. Otherwise, the test errors immediately. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * fix failing image e2e testValentin Rothberg2021-02-18
| | | | | | | | | | | | | | | | The timestamps of some images must have changed changing the number of expected filtered images. The test conditions seem fragile but for now it's more important to get CI back. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * Fix broken podman generate systemd --new with podsPaul Holzinger2021-02-18
| | | | | | | | | | | | | | | | | | | | | | The unit generation accidentally escaped the %t in the pod id file path. This is a regression caused by #9178. This was not caught by the tests because the test itself was wrong. It used a full path instead of the systemd variable %t like the actual code does. Fixes #9373 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
| * Don't chown workdir if it already existsDaniel J Walsh2021-02-18
| | | | | | | | | | | | | | | | | | Currently podman is always chowning the WORKDIR to root:root This PR will return if the WORKDIR already exists. Fixes: https://github.com/containers/podman/issues/9387 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * correct startup error messageValentin Rothberg2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | The error message when failing to create an image engine unconditionally pointed to the Podman socket which is quite confusing when running locally. Move the error message to the point where the first ping to the service fails. [NO TESTS NEEDED] Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * fix create container: handle empty host portMatej Vasek2021-02-18
| | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * podman build: pass runtime to buildahValentin Rothberg2021-02-18
| | | | | | | | | | | | | | | | | | | | Make sure that Podman's default OCI runtime is passed to Buildah in `podman build`. In theory, Podman and Buildah should use the same defaults but the projects move at different speeds and it turns out we caused a regression in v3.0. Fixes: #9365 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * images/create: always pull imageValentin Rothberg2021-02-18
| | | | | | | | | | | | | | | | | | The `images/create` endpoint should always attempt to pull a newer image. Previously, the local images was used which is not compatible with Docker and caused issues in the Gitlab CI. Fixes: #9232 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * Fix panic in pod creationbaude2021-02-18
| | | | | | | | | | | | | | | | | | | | when creating a pod with --infra-image and using a untagged image for the infra-image (none/none), the lookup for the image's name was creating a panic. Fixes: #9374 Signed-off-by: baude <bbaude@redhat.com>
| * do not set empty $HOMEValentin Rothberg2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to not set an empty $HOME for containers and let it default to "/". https://github.com/containers/crun/pull/599 is required to fully address #9378. Partially-Fixes: #9378 Signed-off-by: Valentin Rothberg <rothberg@redhat.com> <MH: Fixed cherry-pick conflicts> Signed-off-by: Matthew Heon <mheon@redhat.com>
| * infra: downgrade warning to debugGiuseppe Scrivano2021-02-18
| | | | | | | | | | | | | | | | | | | | if the current process could not be moved to a different systemd cgroup do not raise a warning but debug message. [NO TESTS NEEDED] Closes: https://github.com/containers/podman/issues/9353 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * Ignore entrypoint=[\"\"]Daniel J Walsh2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | We recieved an issue with an image that was built with entrypoint=[""] This blows up on Podman, but works on Docker. When we setup the OCI Runtime, we should drop entrypoint if it is == [""] https://github.com/containers/podman/issues/9377 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * podman ps --format '{{ .Size }}' requires --size optionDaniel J Walsh2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | Podman -s crashes when the user specifies the '{{ .Size }}` format on the podman ps command, without specifying the --size option. This PR will stop the crash and print out a logrus.Error stating that the caller should add the --size option. Fixes: https://github.com/containers/podman/issues/9408 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * Change source path resolution for volume copy-upMatthew Heon2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the container's mountpoint as the base of the chroot and indexing from there by the volume directory, instead use the full path of what we want to copy as the base of the chroot and copy everything in it. This resolves the bug, ends up being a bit simpler code-wise (no string concatenation, as we already have the full path calculated for other checks), and seems more understandable than trying to resolve things on the destination side of the copy-up. Fixes #9354 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Fix an issue where copyup could fail with ENOENTMatthew Heon2021-02-18
|/ | | | | | | | | | | | | | | | | | This one is rather bizarre because it triggers only on some systems. I've included a CI test, for example, but I'm 99% sure we use images in CI that have volumes over empty directories, and the earlier patch to change copy-up implementation passed CI without complaint. I can reproduce this on a stock F33 VM, but that's the only place I have been able to see it. Regardless, the issue: under certain as-yet-unidentified environmental conditions, the copier.Get method will return an ENOENT attempting to stream a directory that is empty. Work around this by avoiding the copy altogether in this case. Signed-off-by: Matthew Heon <mheon@redhat.com>
* Merge pull request #9349 from baude/v3unixtsOpenShift Merge Robot2021-02-13
|\ | | | | V3unixts [3.0 Backports]
| * change ps Created to unixbaude2021-02-12
| | | | | | | | | | | | | | | | change from unixnano to unix for ps created --format json [NO TESTS NEEDED] Signed-off-by: baude <bbaude@redhat.com>
| * container ps json format miscuebaude2021-02-12
| | | | | | | | | | | | | | | | | | | | when printing out json format, we mistakenly changed the Created field output to be a time.time in a different commit. This allows for override of the Created field to be a unix ts as type int64. Fixes: #9315 Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #9346 from vrothberg/3.0-layer-tree-errorsOpenShift Merge Robot2021-02-13
|\ \ | | | | | | [3.0] make layer-tree lookup errors non-fatal
| * | make layer-tree lookup errors non-fatalValentin Rothberg2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally, Podman constructs a tree of layers in containers/storage to quickly compute relations among layers and hence images. To compute the tree, we intersect all local layers with all local images. So far, lookup errors have been fatal which has turned out to be a mistake since it seems fairly easy to cause storage corruptions, for instance, when killing builds. In that case, a (partial) image may list a layer which does not exist (anymore). Since the errors were fatal, there was no easy way to clean up and many commands were erroring out. To improve usability, turn the fatal errors into warnings that guide the user into resolving the issue. In this case, a `podman system reset` may be the approriate way for now. [NO TESTS NEEDED] because I have no reliable way to force it. [1] https://github.com/containers/podman/issues/8148#issuecomment-778253474 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #9344 from mheon/cstorage_1246OpenShift Merge Robot2021-02-13
|\ \ \ | |_|/ |/| | Bump c/storage to v1.24.6
| * | Bump c/storage to v1.24.6Matthew Heon2021-02-12
|/ / | | | | | | | | | | Addresses RHBZ#1924562. Signed-off-by: Matthew Heon <mheon@redhat.com>