summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Do not return from c.stop() before re-lockingMatthew Heon2021-03-05
| | | | | | | | | | | | | | Unlocking an already unlocked lock is a panic. As such, we have to make sure that the deferred c.lock.Unlock() in c.StopWithTimeout() always runs on a locked container. There was a case in c.stop() where we could return an error after we unlock the container to stop it, but before we re-lock it - thus allowing for a double-unlock to occur. Fix the error return to not happen until after the lock has been re-acquired. Fixes #9615 Signed-off-by: Matthew Heon <mheon@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>
* | | Merge pull request #9142 from cevich/releaseprocessOpenShift Merge Robot2021-03-01
|\ \ \ | | | | | | | | [CI:DOCS]First pass at release process
| * | | [CI:DOCS] Improve release process docsChris Evich2021-03-01
| | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | [CI:DOCS]First pass at release processbaude2021-02-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | take the existing release process from the google docs and get it checked into our git repo. organized the process by adding task headers and steps beneath them where possible. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #9542 from vrothberg/rmi-hardeningOpenShift Merge Robot2021-03-01
|\ \ \ \ | |_|/ / |/| | | podman rmi: handle corrupted storage better
| * | | podman rmi: handle corrupted storage betterValentin Rothberg2021-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The storage can easily be corrupted when a build or pull process (or any process *writing* to the storage) has been killed. The corruption surfaces in Podman reporting that a given layer could not be found in the layer tree. Those errors must not be fatal but only logged, such that the image removal may continue. Otherwise, a user may be unable to remove an image. [NO TESTS NEEDED] as I do not yet have a reliable way to cause such a storage corruption. Reported-in: https://github.com/containers/podman/issues/8148#issuecomment-787598940 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #9531 from Luap99/fix-9526OpenShift Merge Robot2021-03-01
|\ \ \ \ | |/ / / |/| | | compat api network ls accept both format options
| * | | compat api network ls accept both format optionsPaul Holzinger2021-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker allows both the old `map[string]map[string]bool` and the newer `map[string][]string` for the filter param so we should too. Fixes #9526 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #9509 from mlegenovic/masterOpenShift Merge Robot2021-03-01
|\ \ \ \ | | | | | | | | | | Correct compat images/create?fromImage response
| * | | | Correct compat images/create?fromImage responseMilivoje Legenovic2021-02-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
* | | | | Merge pull request #9527 from rhatdan/hostsOpenShift Merge Robot2021-03-01
|\ \ \ \ \ | | | | | | | | | | | | Enable no_hosts from containers.conf
| * | | | | Enable no_hosts from containers.confDaniel J Walsh2021-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we have no good way to enable this on the server side, we will just allow it to be set on the client side. This should solve almost all cases. Partially fixes: https://github.com/containers/podman/issues/9500 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #9533 from elimisteve/patch-3OpenShift Merge Robot2021-02-27
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [CI:DOCS] podman-image-sign.1.md: typo fix
| * | | | | podman-image-sign.1.md: typo fixSteve Phillips2021-02-27
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | identify -> identity Signed-off-by: Steve Phillips <steve@tryingtobeawesome.com>
* | | | | Merge pull request #8749 from edsantiago/upgrade_testOpenShift Merge Robot2021-02-26
|\ \ \ \ \ | |/ / / / |/| | | | podman upgrade tests
| * | | | podman upgrade testsEd Santiago2021-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial validation of using podman-in-podman to create an old-podman root, then use new-podman to play with the containers created therein. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #9505 from TristanCacqueray/masterOpenShift Merge Robot2021-02-26
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] swagger: removes the schema type for PodSpecGenerator $ref
| * | | | | swagger: removes the schema type for PodSpecGenerator $refTristan Cacqueray2021-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a $ref, the type is ignored and it can confuse the openapi codegen and make it fails with this error: attribute paths.'/libpod/pods/create'(post).[create].type is unexpected This change removes the schema type attribute. Signed-off-by: Tristan Cacqueray <tdecacqu@redhat.com>
* | | | | | Merge pull request #9491 from edsantiago/testimage_multiarchOpenShift Merge Robot2021-02-25
|\ \ \ \ \ \ | | | | | | | | | | | | | | system test image: build it multiarch
| * | | | | | system test image: build it multiarchEd Santiago2021-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buildah now supports running under emulation[1] as well as creating manifests. Use those features to create a multiarch testimage that can be used to test podman on other arches. [1] on Fedora 33, this requires the qemu-user-static package We also build a new :00000001 image, replacing :00000000, because (sigh) some tests try to run 'true' in the container. Include instructions on building said image. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | | Merge pull request #9518 from baude/pruneremotecommandOpenShift Merge Robot2021-02-25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | prune remotecommand dependency
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-02 17:36:45 +0000