aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Podman image: Mass cleanup + fix missing storage.confChris Evich2022-06-01
| | | | | | | | | | | | | | | | | | As of Fedora 36, `/etc/containers/storage.conf` with defaults is installed under `/usr/share/containers/`. This was causing builds to fail in the necessary `sed` command that enables fuse-overlayfs. Fix this by using sed on the new location with an output redirect into the `etc` location. Also, perform a mass-cleanup of the three files to make them easier to read/maintain. Including renaming them to `Containerfile`, since all native build tooling is now used to produce them. Lastly, take advantage of the `podman-next` copr repository to install the latest/greatest podman from `main`, rather than building it from scratch. This will greatly speed up the image build speed. Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #14424 from lsm5/gopkg-in-yaml-bumpOpenShift Merge Robot2022-06-01
|\ | | | | Bump gopkg.in/yaml.v3 to v3.0.1
| * Bump gopkg.in/yaml.v3 to v3.0.1Lokesh Mandvekar2022-05-31
| | | | | | | | | | | | | | | | | | v3.0.1 resolves GHSA-hp87-p4gw-j4gq - CVE-2022-28948. While podman doesn't appear to be vulnerable to the CVE as the concerned code isn't being called, this update should silence a dependabot alert. Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | Merge pull request #14433 from Luap99/restore-netOpenShift Merge Robot2022-05-31
|\ \ | |/ |/| fix podman container restore without CreateNetNS
| * fix podman container restore without CreateNetNSPaul Holzinger2022-05-31
|/ | | | | | | | | | | | | | | | When a container does not use the default podman netns, for example --network none or --network ns:/path a restore would fail because the specgen check validates that c.config.StaticMAC is nil but the unmarshaller sets it to an empty slice. While we could make the check use len() > 0 I feel like it is more common to check with != nil for ip and mac addresses. Adding omitempty tag makes the json marshal/unmarshal work correctly. This should not cause any issues. Fixes #14389 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* Merge pull request #14419 from Luap99/volume-importOpenShift Merge Robot2022-05-31
|\ | | | | podman volume export/import: give better error
| * podman volume export/import: give better errorPaul Holzinger2022-05-30
| | | | | | | | | | | | | | | | | | When the volume does not exist we should output an error stating so and not some generic one. Fixes #14411 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | Merge pull request #14415 from nicrowe00/14133OpenShift Merge Robot2022-05-31
|\ \ | |/ |/| no-new-privileges format
| * Podman no-new-privileges formatNiall Crowe2022-05-30
|/ | | | | | | | | | | | In docker, the format of no-new-privileges is "no-new-privileges:true". However, for Podman all that's required is "no-new-privileges", leading to issues when attempting to use features desgined for docker in podman. Adding support for the ":" format to be used along with the "=" format, depedning on which one is entered by the user. fixes #14133 Signed-off-by: Niall Crowe <nicrowe@redhat.com>
* Merge pull request #14383 from jwhonce/wip/info_todoOpenShift Merge Robot2022-05-27
|\ | | | | Add Authorization field to Plugins for Info
| * Refactor populating uptimeJhon Honce2022-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor populating uptime field to use standard library parsing and math for populating the hour, minute, seconds fields. Note: the go-humanize package does not cover time.Duration just time.time. ```release-note NONE ``` [NO NEW TESTS NEEDED] Signed-off-by: Jhon Honce <jhonce@redhat.com>
| * Add Authorixation field to Plugins for InfoJhon Honce2022-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Authorization field lists the plugins for granting access to the Docker daemon. This field will always be nil for Podman as there is no daemon. The field is included for compatibility. ```release-note NONE ``` [NO NEW TESTS NEEDED] Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #14393 from jwhonce/wip/archive_todoOpenShift Merge Robot2022-05-27
|\ \ | | | | | | Add API support for NoOverwriteDirNonDir
| * | Add API support for NoOverwriteDirNonDirJhon Honce2022-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update method signatures and structs to pass option to buildah code ```release-note NONE ``` [NO NEW TESTS NEEDED] Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #14320 from flouthoc/build-honor-squash-and-layersOpenShift Merge Robot2022-05-27
|\ \ \ | | | | | | | | build: allow using `cache` explicitly with `--squash-all` using `--layers`
| * | | vendor: bump buildah to v1.26.1-0.20220524184833-5500333c2e06Aditya R2022-05-26
| | | | | | | | | | | | | | | | | | | | | | | | Bump buildah to v1.26.1-0.20220524184833-5500333c2e06 Signed-off-by: Aditya R <arajan@redhat.com>
| * | | build: allow using cache explicitly with --squash-all using --layersAditya R2022-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buildah already supports using `--layers` with `--squash` after https://github.com/containers/buildah/pull/3674 if user wants to do so hence podman must honor similar configuration in `--squash-all` behaviour if user wants to using cache. PS: We cannot alter behaviour of `podman build --squash` for docker-compat reasons hence this feature can be easily supported by `--squash-all`. Closes: https://github.com/containers/buildah/issues/4011 Signed-off-by: Aditya R <arajan@redhat.com>
| * | | cmd, build: remove redundant squash processing logicAditya R2022-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same block contains similar lines above this is not needed as this looks redundant. [NO NEW TESTS NEEDED] [NO TESTS NEEDED] Signed-off-by: Aditya R <arajan@redhat.com>
* | | | Merge pull request #14387 from TomSweeneyRedHat/dev/tsweeney/quickdocOpenShift Merge Robot2022-05-27
|\ \ \ \ | |_|/ / |/| | | [CI:DOCS] Quick typo for troubleshooting
| * | | [CI:DOCS] Quick typo for troubleshootingtomsweeneyredhat2022-05-26
|/ / / | | | | | | | | | | | | | | | | | | After lgtming the latest from @flouthouc, I spotted one more minor typo in the troubleshooting guide. This corrects it. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
* | | Merge pull request #14382 from jwhonce/wip/init_todoOpenShift Merge Robot2022-05-26
|\ \ \ | | | | | | | | Remove TODO comment
| * | | Remove TODO commentJhon Honce2022-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allowing custom flags to provider has the potential to break all the hand-crafted commands currently in use. This could become a support nightmare. ```release-note NONE ``` [NO NEW TESTS NEEDED] Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #14377 from SoMuchForSubtlety/fix/pod-inspect-responseOpenShift Merge Robot2022-05-26
|\ \ \ \ | | | | | | | | | | Fix swagger model of `InspectPodResponse`
| * | | | Fix swagger model of `InspectPodResponse`Jakob Ahrer2022-05-26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `net.IP` gets marshalled as `string` and not `[]uint8` [NO TESTS NEEDED] [NO NEW TESTS NEEDED] Signed-off-by: Jakob Ahrer <jakob@ahrer.dev>
* | | | Merge pull request #14374 from umohnani8/todo-3OpenShift Merge Robot2022-05-26
|\ \ \ \ | | | | | | | | | | Combine the CheckAllLatest CID and PodID functions
| * | | | Combine the CheckAllLatest CID and PodID functionsUrvashi Mohnani2022-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two functions were doing the exact same thing just with cidfile and pod-id-file separately. Combine the functionality to one function to remove repetative code. Fix the TODO in cmd/podman/validate/args.go [NO NEW TESTS NEEDED] Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | | Merge pull request #14355 from flouthoc/server-client-compat-for-bug-fixOpenShift Merge Robot2022-05-26
|\ \ \ \ \ | |_|_|_|/ |/| | | | [CI:Docs]: note regarding version compatablity between server and client for bug fixes.
| * | | | docs: note regarding version compatablity between server and client for bug ↵Aditya R2022-05-26
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes Add a small note to troubleshooting docs regaring version parity between podman-client and podman-server when looking for bug fixes. [NO TESTS NEEDED] [NO NEW TESTS NEEDED] Closes: https://github.com/containers/podman/issues/12660 Signed-off-by: Aditya R <arajan@redhat.com>
* | | | Merge pull request #14381 from cevich/fix_cirrus_todoOpenShift Merge Robot2022-05-26
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Cirrus: Fix several TODOs
| * | | | Cirrus: Fix several TODOsChris Evich2022-05-26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most were simply deleted, the main one addressed is in the "pre-testing" `ext_svc_check.sh` script. It will now verify accessibility of several key test images we maintain in `quay.io`. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #14373 from umohnani8/todo-2OpenShift Merge Robot2022-05-26
|\ \ \ \ | |/ / / |/| | | Fix TODO in pod/ps.go and parse/net.go
| * | | Fix TODO in parse/net.goUrvashi Mohnani2022-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix up the parseEnv function to differentiate between a label and env when parsing. Don't do a system lookup when parsing labels. [NO NEW TESTS NEEDED] Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
| * | | Remove TODO from pods/ps.goUrvashi Mohnani2022-05-26
| |/ / | | | | | | | | | | | | | | | | | | | | | The TODO has already been fixed. Filters is now a []string [NO NEW TESTS NEEDED] Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | Merge pull request #14378 from SoMuchForSubtlety/fix-contributing-docsOpenShift Merge Robot2022-05-26
|\ \ \ | | | | | | | | [CI:DOCS] Fix test block bypass instructions
| * | | Fix test block bypass instructionsJakob Ahrer2022-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new string was added in 521c0cb and the old one removed with 2ed31f9 [NO NEW TESTS NEEDED] Signed-off-by: Jakob Ahrer <jakob@ahrer.dev>
* | | | Merge pull request #14318 from umohnani8/play-kubeOpenShift Merge Robot2022-05-26
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Add play kube support docs
| * | | | [CI:DOCS] Add play kube support docsUrvashi Mohnani2022-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a doc to outline which kube yaml fields the play kube command currently supports. This will be updated as more fields are supported in the future. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | | Merge pull request #14369 from mheon/fixmes_2OpenShift Merge Robot2022-05-26
|\ \ \ \ \ | |_|_|_|/ |/| | | | Remove more FIXMEs
| * | | | Remove more FIXMEsMatthew Heon2022-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly, just removing the comments. These either have been done, or are no longer a good idea. No code changes. [NO NEW TESTS NEEDED] as such. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #14366 from jwhonce/wip/rm_todoOpenShift Merge Robot2022-05-25
|\ \ \ \ \ | | | | | | | | | | | | Support remote deadlock errors in rm
| * | | | | Support remote deadlock errors in rmJhon Honce2022-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor test for deadlock by comparing error text vs. actual ErrWillDeadlock constant. When running with --remote the error constant will always be not equal to the error returned by the API. ```release-note NONE ``` [NO NEW TESTS NEEDED] Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | Merge pull request #14329 from mheon/fixmes_1OpenShift Merge Robot2022-05-25
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | First batch of resolutions to FIXMEs
| * | | | | First batch of resolutions to FIXMEsMatthew Heon2022-05-25
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of these are no longer relevant, just drop the comments. Most notable change: allow `podman kill` on paused containers. Works just fine when I test it. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | Merge pull request #14364 from jwhonce/wip/diff_todoOpenShift Merge Robot2022-05-25
|\ \ \ \ \ | |/ / / / |/| | | | Remove unused archive flag from diff commands
| * | | | Remove unused archive flag from diff commandsJhon Honce2022-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Option left in images/diff.go CLI as comment implies it is needed for backwards compatibility. ```release-note NONE ``` [NO NEW TESTS NEEDED] Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #14342 from ↵Daniel J Walsh2022-05-25
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/vbauerster/mpb/v7-7.4.2 build(deps): bump github.com/vbauerster/mpb/v7 from 7.4.1 to 7.4.2
| * | | | build(deps): bump github.com/vbauerster/mpb/v7 from 7.4.1 to 7.4.2dependabot[bot]2022-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/vbauerster/mpb/v7](https://github.com/vbauerster/mpb) from 7.4.1 to 7.4.2. - [Release notes](https://github.com/vbauerster/mpb/releases) - [Commits](https://github.com/vbauerster/mpb/compare/v7.4.1...v7.4.2) --- updated-dependencies: - dependency-name: github.com/vbauerster/mpb/v7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | | Merge pull request #14361 from Luap99/netflakeOpenShift Merge Robot2022-05-25
|\ \ \ \ \ | |_|/ / / |/| | | | fix f35 integration test network flake
| * | | | fix f35 integration test network flakePaul Holzinger2022-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I am not 100% sure if this is actually causing the problem but I was able to reproduce locally and this change fixed it there. Without the `-n` option iptables tries to reverse lookup the ips to domain names. This is extremely slow for unknown reasons. Given the large amount of iptables entries due parallel test runs it will not succeed in the default 90 sec timeout. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | Merge pull request #14358 from vrothberg/todo-part-2OpenShift Merge Robot2022-05-25
|\ \ \ \ \ | | | | | | | | | | | | Todo part 2