summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #9604 from mheon/fix_9510OpenShift Merge Robot2021-03-04
|\ | | | | Compat API: create volume source dirs on the host
| * Compat API: create volume source dirs on the hostMatthew Heon2021-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It took a lot to figure out exactly how this should work, but I think I finally have it. My initial versions of this created the directory with the same owner as the user the container was run with, which was rather complicated - but after review against Docker, I have determined that is incorrect, and it's always made as root:root 0755 (Ubuntu's Docker, which I was using to try and test, is a snap - and as such it was sandboxed, and not actually placing directories it made in a place I could find?). This makes things much easier, since I just need to parse out source directories for binds and ensure they exist. Fixes #9510 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #9550 from baude/issue9517OpenShift Merge Robot2021-03-04
|\ \ | | | | | | Support label type dict on compat build
| * | Support label type dict on compat buildbaude2021-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | The compatibility endpoint for build labels should be of type dict (not list). For backwards compatibility, we support both. Fixes: #9517 Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #9568 from wjt/podman-system-service-timeout-docsOpenShift Merge Robot2021-03-04
|\ \ \ | | | | | | | | [ci:docs] podman-system-service.1.md: fix timeout example
| * | | podman-system-service.1.md: fix timeout exampleWill Thompson2021-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of this document claims that the argument is called '--time', not '--timeout', and that the value is expressed in seconds. As currently written, the example (which ostensibly runs the API service for 5 seconds) uses the '--timeout' spelling (which actually does work, as an undocumented alias) and passes a value of '5000', which is more than an hour. Fix both. [NO TESTS NEEDED] as this is a simple documentation change. Signed-off-by: Will Thompson <wjt@endlessos.org>
* | | | Merge pull request #9617 from vrothberg/fix-9588OpenShift Merge Robot2021-03-04
|\ \ \ \ | | | | | | | | | | image removal: ignore unknown-layer errors
| * | | | image removal: ignore unknown-layer errorsValentin Rothberg2021-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] as I have absolutely no idea how to force a reliable reproducer. Fixes: #9588 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #9601 from jwhonce/issues/9207OpenShift Merge Robot2021-03-04
|\ \ \ \ \ | | | | | | | | | | | | Use version package to track all versions
| * | | | | Use version package to track all versionsJhon Honce2021-03-03
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Server, bindings, and CLI all now pull version information from version package. * Current /libpod API version slaved to podman/libpod Version * Bindings validate against libpod API Minimal version * Remove pkg/bindings/bindings.go and updated tests Fixes: #9207 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #9614 from Luap99/fix-9602OpenShift Merge Robot2021-03-04
|\ \ \ \ \ | |_|/ / / |/| | | | Fix cni teardown errors
| * | | | Fix cni teardown errorsPaul Holzinger2021-03-04
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to pass the cni interface descriptions to cni teardowns. Otherwise cni cannot find the correct cache files because the interface name might not match the networks. This can only happen when network disconnect was used. Fixes #9602 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #9605 from lsm5/Makefile-install-docker-docs-nobuildOpenShift Merge Robot2021-03-04
|\ \ \ \ | |/ / / |/| | | Makefile: add install.docker-docs-nobuild for packaging use
| * | | Makefile: add install.docker-docs-nobuild for packaging useLokesh Mandvekar2021-03-03
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | This will allow installation of the manpages without the need to rebuild them in the installation stage of distro packaging. [NO TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | Merge pull request #9536 from jmguzik/enable-cgroupsv2-sec-optsOpenShift Merge Robot2021-03-03
|\ \ \ | | | | | | | | Enable cgroupsv2 rw mount via security-opt unmask
| * | | Add /sys/fs/cgroup as readonly path in docsJakub Guzik2021-03-03
| | | | | | | | | | | | | | | | Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
| * | | Enable cgroupsv2 rw mount via security-opt unmaskJakub Guzik2021-02-28
| | | | | | | | | | | | | | | | Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
* | | | Merge pull request #9595 from Luap99/fix-9594OpenShift Merge Robot2021-03-03
|\ \ \ \ | | | | | | | | | | Fix possible panic with podman build --iidfile
| * | | | Fix possible panic with podman build --iidfilePaul Holzinger2021-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we check for errors before trying to write the iidfile. [NO TESTS NEEDED] Ref #9594 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #9581 from baude/issue9529OpenShift Merge Robot2021-03-03
|\ \ \ \ \ | | | | | | | | | | | | Add network summary to compat ps
| * | | | | Add network summary to compat psbaude2021-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compatibility endpoint for listing containers should have the summarized network configuration with it. Fixes: #9529 Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #9583 from ashley-cui/secOpenShift Merge Robot2021-03-03
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add version field to secret compat list/inspect api
| * | | | | | Add version field to secret compat list/inspect apiAshley Cui2021-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker api expects secrets endpoint to have a version field. So, the version field is added into the compat endpoint only. The version field is always 1, since Docker uses the version to keep track of updates to the secret, and currently we cannot update a secret. Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | | | | Merge pull request #9575 from mheon/rewrite_renameOpenShift Merge Robot2021-03-03
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Rewrite Rename backend in a more atomic fashion
| * | | | | | Rewrite Rename backend in a more atomic fashionMatthew Heon2021-03-02
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the core of renaming logic into the DB. This guarantees a lot more atomicity than we have right now (our current solution, removing the container from the DB and re-creating it, is *VERY* not atomic and prone to leaving a corrupted state behind if things go wrong. Moving things into the DB allows us to remove most, but not all, of this - there's still a potential scenario where the c/storage rename fails but the Podman rename succeeds, and we end up with a mismatched state. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | Merge pull request #9580 from rhatdan/timestampDaniel J Walsh2021-03-03
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix support for podman build --timestamp
| * | | | | | Fix support for podman build --timestampDaniel J Walsh2021-03-02
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently podman is ignoreing the build --timestamp flag. This PR fixes this for local and remote clients. Fixes: https://github.com/containers/podman/issues/9569 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #9521 from adrianreber/2021-02-25-checkpointctlOpenShift Merge Robot2021-03-03
|\ \ \ \ \ \ | | | | | | | | | | | | | | Reorder checkpoint/restore code for CRI-O
| * | | | | | Use functions and defines from checkpointctlAdrian Reber2021-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes. [NO TESTS NEEDED] - only moving code around Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | Move checkpoint/restore code to pkg/checkpoint/crutilsAdrian Reber2021-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To be able to reuse common checkpoint/restore functions this commit moves code to pkg/checkpoint/crutils. This commit has not functional changes. It only moves code around. [NO TESTS NEEDED] - only moving code around Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | Vendor in checkpointctlAdrian Reber2021-03-02
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkpointctl contains common code to work with checkpoint images in Podman, CRI-O and Kubernetes. Use functions and definitions from checkpointctl where possible. Signed-off-by: Adrian Reber <areber@redhat.com>
* | | | | | Merge pull request #9477 from ashley-cui/journaldOpenShift Merge Robot2021-03-02
|\ \ \ \ \ \ | | | | | | | | | | | | | | Tidy duplicate log tests
| * | | | | | Tidy duplicate log testsAshley Cui2021-03-02
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some log tests were duplicated, and some didn't need to be repeated for every driver. Also, added some comments Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | | | Merge pull request #9512 from mheon/fix_9511OpenShift Merge Robot2021-03-02
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix parsing of Tmpfs field in compat create
| * | | | | | Fix parsing of Tmpfs field in compat createMatthew Heon2021-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create is not formatted as `key=value` but rather `key:value` (technically `path:option1,option2`). As such we can't use the stringMapToArray function, and instead need to generate it manually. Fixes #9511 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | Merge pull request #9560 from TristanCacqueray/libpodPutArchiveOpenShift Merge Robot2021-03-02
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | [NO TESTS NEEDED] swagger: update the libpodPutArchive verb
| * | | | | | swagger: update the libpodPutArchive operation verbTristan Cacqueray2021-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the libpodPutArchive verb to PUT (POST results in 405). Signed-off-by: Tristan Cacqueray <tdecacqu@redhat.com>
* | | | | | | Merge pull request #9557 from liuming50/split-docker-install-docsOpenShift Merge Robot2021-03-02
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | [NO TESTS NEEDED] Makefile: split install.docker-docs from install.docker
| * | | | | | Makefile: install systemd services conditionallyMing Liu2021-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only install systemd services provided that systemd is in BUILDTAGS. Signed-off-by: Ming Liu <liu.ming50@gmail.com>
| * | | | | | Makefile: split install.docker-docs from install.dockerMing Liu2021-03-02
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows end users to be able to choose to not install any docs. Signed-off-by: Ming Liu <liu.ming50@gmail.com>
* | | | | | Merge pull request #9561 from Luap99/update-ocicniOpenShift Merge Robot2021-03-02
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Bump github.com/cri-o/ocicni to latest master
| * | | | | Bump github.com/cri-o/ocicni to latest masterPaul Holzinger2021-03-01
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #9472 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #9563 from mlegenovic/masterOpenShift Merge Robot2021-03-02
|\ \ \ \ \ | |_|/ / / |/| | | | Compat api containers/json Ports field is null
| * | | | Compat api containers/json Ports field is nullMilivoje Legenovic2021-03-02
| |/ / / | | | | | | | | | | | | | | | | | | | | Fixes #9553 Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
* | | | Merge pull request #9565 from AkihiroSuda/bump-rootlesskit-20210302OpenShift Merge Robot2021-03-02
|\ \ \ \ | |/ / / |/| | | Bump RootlessKit v0.14.0-beta.0
| * | | Bump RootlessKit v0.14.0-beta.0Akihiro Suda2021-03-02
|/ / / | | | | | | | | | | | | | | | https://github.com/rootless-containers/rootlesskit/releases/tag/v0.14.0-beta.0 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
* | | Merge pull request #9556 from jwhonce/wip/dockerOpenShift Merge Robot2021-03-01
|\ \ \ | | | | | | | | Refactor python tests to run against python3.9
| * | | Refactor python tests to run against python3.9Jhon Honce2021-03-01
|/ / / | | | | | | | | | | | | | | | | | | | | | * Introduce sub-package compat to meet packaging and import requirements * Update documenation for running tests * Add requirements.txt to improve IDE support Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #9555 from edsantiago/apiv2_test_readabilityOpenShift Merge Robot2021-03-01
|\ \ \ | | | | | | | | APIv2 tests: make more maintainable
| * | | APIv2 tests: make more maintainableEd Santiago2021-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While I wasn't looking, some completely unreadable cruft crept in here, and it's totally my fault: I never knew you could pass JSON to a GET query. Everyone who DID know that, did so, but had to URL-escape it into a completely gobbledygook mess to make curl happy. Solution: trivial, do the URL-escaping in 't' itself. I just never realized that was needed. I'm so sorry. I hope this helps. Signed-off-by: Ed Santiago <santiago@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-01 11:32:20 +0000