summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #10056 from mheon/misc_cleanupOpenShift Merge Robot2021-04-19
|\ | | | | [NO TESTS NEEDED] Make an advanced layer diff function private
| * Remove an advanced layer diff functionMatthew Heon2021-04-19
| | | | | | | | | | | | | | | | | | | | | | | | Noticed this while I was poking around in the runtime doing DB work. The signature of this function makes me a bit uncomfortable (why should we let people apply arbitrary diffs to layers? Seems like a good way to break things...) and it's completely unused, so let's just remove it. [NO TESTS NEEDED] since this is a pure removal. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #10025 from zhangguanzhang/remote-save-dirOpenShift Merge Robot2021-04-19
|\ \ | | | | | | Fixes podman-remote save to directories does not work
| * | Fixes podman-remote save to directories does not workzhangguanzhang2021-04-15
| | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | Merge pull request #10070 from TomSweeneyRedHat/dev/tsweeney/fixintrotypoOpenShift Merge Robot2021-04-19
|\ \ \ | | | | | | | | [CI:DOCS] Fix introduction page typo
| * | | [CI:DOCS] Fix introduction page typoTomSweeneyRedHat2021-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a small typo on the introduction pages. Fixes: #10042 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | Merge pull request #10069 from EduardoVega/clean-mounts-9618OpenShift Merge Robot2021-04-19
|\ \ \ \ | |/ / / |/| | | Ensure mount destination is clean, no trailing slash
| * | | Ensure mount destination is clean, no trailing slashEduardo Vega2021-04-18
|/ / / | | | | | | | | | Signed-off-by: Eduardo Vega <edvegavalerio@gmail.com>
* | | Merge pull request #10018 from jmguzik/more-network-bindings-testsOpenShift Merge Robot2021-04-17
|\ \ \ | | | | | | | | Add network bindings tests: remove and list
| * | | Add network bindings tests: remove and listJakub Guzik2021-04-15
| | | | | | | | | | | | | | | | Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
* | | | Merge pull request #10043 from Luap99/play-kube-ipOpenShift Merge Robot2021-04-17
|\ \ \ \ | | | | | | | | | | add --ip to podman play kube
| * | | | add --ip to podman play kubePaul Holzinger2021-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new --ip flag to podman play kube. This is used to specify a static IP address which should be used for the pod. This option can be specified several times because play kube can create more than one pod. Fixes #8442 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #10050 from Luap99/image-prune-panicOpenShift Merge Robot2021-04-16
|\ \ \ \ \ | | | | | | | | | | | | Fix possible panic in libpod/image/prune.go
| * | | | | Fix possible panic in libpod/image/prune.goPaul Holzinger2021-04-16
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman image prune paniced locally for me. The error handling was not done correctly and we could end up with a nil pointer dereference. [NO TESTS NEEDED] I have no idea how I could force an error in img.Size(). Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #10021 from zhangguanzhang/invalid-save-expressionOpenShift Merge Robot2021-04-16
|\ \ \ \ \ | | | | | | | | | | | | Fix invalid expression in save command
| * | | | | Fixes invalid expression in save commandzhangguanzhang2021-04-14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | | | Merge pull request #10046 from edsantiago/batsOpenShift Merge Robot2021-04-16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | system tests: build --pull-never: deal with flakes
| * | | | | system tests: build --pull-never: deal with flakesEd Santiago2021-04-15
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test continues to flake on podman-remote (especially Ubuntu) even after #10030 and #10034. I give up. Stop checking the error message in podman-remote tests. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #10010 from lsm5/GO111MODULE-OFF-fix-buildOpenShift Merge Robot2021-04-15
|\ \ \ \ \ | | | | | | | | | | | | fix build with with GO111MODULE=off
| * | | | | Fix build with GO111MODULE=offLokesh Mandvekar2021-04-15
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Distro builds on Fedora and Kubic projects use GO111MODULE=off by default which are currently failing. This commit fixes it and going forward, podman CI will also indicate failures in rpm builds. The additional LDFLAGS have been removed from the spec file which is not ideal. But, currently we only use the spec file to check if the rpm builds fine. We can fix the LDFLAGS in a later commit when we're working on packit integration. conmon build has also been removed from podman.spec.in because the COPR for which it was provided has been discontinued. [NO TESTS NEEDED] Fixes: #10009 Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | | | Merge pull request #10045 from Luap99/compose-test-debugOpenShift Merge Robot2021-04-15
|\ \ \ \ \ | | | | | | | | | | | | compose test: diagnose flakes v3
| * | | | | compose test: diagnose flakes v3Paul Holzinger2021-04-15
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the debug output we know that rootlesskit does not bind the port correctly. The rootlesskit port forwarder has a quite a few debug statements so lets see the debug log when the test fails. Also check if it binded the port inside the rootless cni namespace. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #10044 from Luap99/fix-10015OpenShift Merge Robot2021-04-15
|\ \ \ \ \ | |/ / / / |/| | | | podman play kube apply correct log driver
| * | | | podman play kube apply correct log driverPaul Holzinger2021-04-15
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --log-driver flag was silently ignored by podman play kube. This regression got introduced during the play kube rework. Unfortunately the test for this was skipped for no good reason. Fixes #10015 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #10035 from pablofsf/volume-chown-docsOpenShift Merge Robot2021-04-15
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Update documentation of podman-run to reflect volume "U" option
| * | | | Update documentation of podman-run to reflect volume "U" optionPablo Correa Gómez2021-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "U" option is accepted by `--volume` in `podman-build`, but documentation is missing Signed-off-by: Pablo Correa Gómez <ablocorrea@hotmail.com>
* | | | | Merge pull request #10040 from ↵OpenShift Merge Robot2021-04-15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.14.2 Bump github.com/rootless-containers/rootlesskit from 0.14.1 to 0.14.2
| * | | | | Bump github.com/rootless-containers/rootlesskit from 0.14.1 to 0.14.2dependabot[bot]2021-04-15
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.14.1 to 0.14.2. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.14.1...v0.14.2) Signed-off-by: dependabot[bot] <support@github.com>
* | | | | Merge pull request #10032 from nalind/trace-levelOpenShift Merge Robot2021-04-15
|\ \ \ \ \ | | | | | | | | | | | | Recognize "trace" logging, and use it for lone errors at exit
| * | | | | Test that we don't error out on advertised --log-level valuesNalin Dahyabhai2021-04-14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
| * | | | | At trace log level, print error text using %+v instead of %vNalin Dahyabhai2021-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're logging at trace level, use %+v instead of %v when printing an error at exit. If the error included stack information, this will cause the backtrace to be printed, which is very handy for debugging. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
| * | | | | pkg/errorhandling.JoinErrors: don't throw away context for lone errorsNalin Dahyabhai2021-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When our multierror contains just one error, don't extract its text only to rewrap it, because doing so discards any stack trace information that might have been added closer to where the error actually originated. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
| * | | | | Recognize --log-level=traceNalin Dahyabhai2021-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "trace" is a valid logrus debugging level, so we should be able to tell the library to display messages logged at that level. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | | | | | Merge pull request #10034 from rhatdan/buildOpenShift Merge Robot2021-04-15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix flake on failed podman-remote build : try 2
| * | | | | Fix flake on failed podman-remote build : try 2Daniel J Walsh2021-04-14
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time we are checking if the function actually succeeded, otherwise we will report an error. Also if we did not get the id, report unexpected failure. [NO TESTS NEEDED] Still no good way to test this, but manually. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #10031 from edsantiago/compose_test_flakes_againOpenShift Merge Robot2021-04-14
|\ \ \ \ \ | |/ / / / |/| | | | compose test: ongoing efforts to diagnose flakes
| * | | | compose test: ongoing efforts to diagnose flakesEd Santiago2021-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yay, we got a failure with the new code (#10017). It shows one ECONNRESET followed by a lot of ECONNREFUSED over an 8-second period (actually 15s because of the second curl retry). My hunch: the container itself is dying. No amount of retrying will get anything to work. So, instead of the curl retry, if curl fails, run 'docker-compose logs', 'podman ps', and 'ss -tulpn' and hope that one/more of those tells us something useful when the test flakes again. Also: DUH! Bitten by one of the most common bash pitfalls. Checking exit status after 'local' will always be zero. Split the declaration and the action into separate lines. Also: if curl fails, return immediately. There's no point in running the string output comparison. Also: in _show_ok(), don't emit "actual/expect" messages if both strings are empty. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #10030 from rhatdan/buildOpenShift Merge Robot2021-04-14
|\ \ \ \ \ | | | | | | | | | | | | Fix flake on failed podman-remote build
| * | | | | Fix flake on failed podman-remote buildDaniel J Walsh2021-04-14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a race condition where podman build can fail but still return an exit code of 0. This PR ensures that as soon as the build fails, the failed flag is set eliminating the race. Fixes: https://github.com/containers/podman/issues/10029 [NO TESTS NEEDED] Tests of failed builds are already in place, and the elimination of the race should be enough. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #10028 from edsantiago/batsOpenShift Merge Robot2021-04-14
|\ \ \ \ \ | |/ / / / |/| | | | System tests: fix racy podman-inspect
| * | | | System tests: fix racy podman-inspectEd Santiago2021-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'podman wait' between kill & inspect. Fixes: #9751 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #9945 from rhatdan/runlabelOpenShift Merge Robot2021-04-14
|\ \ \ \ \ | | | | | | | | | | | | Fix handling of $NAME and $IMAGE in runlabel
| * | | | | Fix handling of $NAME and $IMAGE in runlabelDaniel J Walsh2021-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/9405 Add system runlabel tests. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #10019 from alvistack/master-linux-amd64OpenShift Merge Robot2021-04-14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Update nix pin with `make nixpkgs`
| * | | | | Update nix pin with `make nixpkgs`Wong Hoi Sing Edison2021-04-14
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
* | | | | Merge pull request #9995 from rhatdan/debugOpenShift Merge Robot2021-04-14
|\ \ \ \ \ | | | | | | | | | | | | Fix message about runtime to show only the actual runtime
| * | | | | Fix message about runtime to show only the actual runtimeDaniel J Walsh2021-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the debug line shows every runtime up until it finds the correct one, confusing users on which runtime it is using. Also move missing OCI runtime from containers/conf down to Debug level and improved the debug message, to not report error. [NO TESTS NEEDED] Since this is just debug. Triggered by https://github.com/containers/podman/issues/4854 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #10017 from edsantiago/compose_test_flakes_againOpenShift Merge Robot2021-04-14
|\ \ \ \ \ \ | | | | | | | | | | | | | | compose test: try to get useful data from flakes
| * | | | | | compose test: try to get useful data from flakesEd Santiago2021-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docker-compose test continues to flake even after #9961. Let's try to get some useful data from the failures, by: * adding -S (--show-error) to curl. With just -s (--silent), curl is completely quiet. With -S, it displays errors. (Not in TAP form, but I'm OK with that) * oops, adding safety checks to the fix from #9961 (it was inadvertently clobbering the curl exit status) And, as long as I'm in this code: logformatter was not highlighting these results, because the '1..N' TAP line needs to be spit out at the end. Have test-compose emit a 'TAP' header <http://testanything.org/> and make logformatter recognize it. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | | Merge pull request #10022 from ↵OpenShift Merge Robot2021-04-14
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/common-0.36.0 Bump github.com/containers/common from 0.35.4 to 0.36.0
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-10-03 02:36:08 +0000