summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #9178 from Luap99/fix-9176OpenShift Merge Robot2021-02-01
|\ | | | | Fix podman generate systemd --new special char handling
| * Fix podman generate systemd --new special char handlingPaul Holzinger2021-02-01
| | | | | | | | | | | | | | | | | | | | In a systemd unit dollar and percent signs are used for variables. A backslash is used for escape sequences. If any of these characters are used in the create command we have to properly escape them so systemd does not try to interpret them. Fixes #9176 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #9168 from Luap99/fix-pod-create-network-parsingOpenShift Merge Robot2021-02-01
|\ \ | | | | | | Fix --network parsing for podman pod create
| * | Fix --network parsing for podman pod createPaul Holzinger2021-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `--network` flag is parsed differently for `podman pod create`. This causes confusion and problems for users. The extra parsing logic ignored unsupported network options such as `none`, `container:...` and `ns:...` and instead interpreted them as cni network names. Tests are added to ensure the correct errors are shown. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #9051 from rhatdan/rmOpenShift Merge Robot2021-02-01
|\ \ \ | |_|/ |/| | Switch podman stop/kill/wait handlers to use abi
| * | Switch podman stop/kill/wait handlers to use abiDaniel J Walsh2021-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change API Handlers to use the same functions that the local podman uses. At the same time: implement remote API for --all and --ignore flags for podman stop implement remote API for --all flags for podman stop Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9173 from mlegenovic/api_fixesOpenShift Merge Robot2021-02-01
|\ \ \ | | | | | | | | Endpoint that lists containers does not return correct Status value
| * | | Endpoint that lists containers does not return correct Status valueMilivoje Legenovic2021-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse and Intellij Docker plugin determines the state of the container via the Status field, returned from /containers/json call. Podman always returns empty string, and because of that, both IDEs show the wrong state of the container. Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
* | | | Merge pull request #9151 from rhatdan/mountOpenShift Merge Robot2021-02-01
|\ \ \ \ | | | | | | | | | | Docker ignores mount flags that begin with constency
| * | | | Docker ignores mount flags that begin with constencyDaniel J Walsh2021-01-30
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1915332 ``` According to the Docker docs, the consistency option should be ignored on Linux. the possible values are 'cached', 'delegated', and 'consistent', but they should be ignored equally. This is a widely used option in scripts run by developer machines, as this makes file I/O less horribly slow on MacOS. ``` Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9138 from mlegenovic/masterOpenShift Merge Robot2021-02-01
|\ \ \ \ | |/ / / |/| | | podman generate kube ignores --network=host
| * | | podman generate kube ignores --network=hostMilivoje Legenovic2021-01-30
| |/ / | | | | | | | | | Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
* | | Merge pull request #9063 from cevich/master_fix_validateOpenShift Merge Robot2021-01-30
|\ \ \ | |/ / |/| | Cirrus: Fix running Validate task on branches
| * | Cirrus: Fix running Validate task on branchesChris Evich2021-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to dbb9943 Despite skipping the `Smoke` check, it was observed on a *new* branch, the `validate` task (specifically `git-validation`) will fail. This is because: * `$CIRRUS_LAST_GREEN_CHANGE` will be empty on a new branch. * `$CIRRUS_BASE_SHA` is always empty for runs triggered by branch-push * `$EPOCH_TEST_COMMIT` will be set to `YOU_FOUND_A_BUG`. Fix this by eliminating the `Smoke` task entirely, simplifying all the `make validate` operations into the `validate` cirrus task. Ensure this task does not run when a new branch or tag is pushed. Also, eliminate the `$CIRRUS_BUILD_ID` value as it's confusing and not actually used anywhere. It was formerly used for building VM images, but this has moved to another repo entirely. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #9161 from baude/macosbuildOpenShift Merge Robot2021-01-29
|\ \ \ | | | | | | | | [CI:DOCS]build instructions for macOS
| * | | [CI:DOCS]build instructions for macOSbaude2021-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add instructions on how to build podman on macOS. big thanks to acui for help in getting this written down. Fixes: #9032 Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #9160 from rhatdan/VENDOROpenShift Merge Robot2021-01-29
|\ \ \ \ | | | | | | | | | | Vendor in containers/buildah v1.19.3
| * | | | Vendor in containers/buildah v1.19.3Daniel J Walsh2021-01-29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #9150 from baude/playkubednsOpenShift Merge Robot2021-01-29
|\ \ \ \ \ | |_|_|_|/ |/| | | | Honor custom DNS in play|generate kube
| * | | | Honor custom DNS in play|generate kubebaude2021-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when creating kubernetes yaml from containers and pods, we should honor any custom dns settings the user provided. in the case of generate kube, these would be provided by --dns, --dns-search, and --dns-opt. if multiple containers are involved in the generate, the options will be cumulative and unique with the exception of dns-opt. when replaying a kube file that has kubernetes dns information, we now also add that information to the pod creation. the options for dnspolicy is not enabled as there seemed to be no direct correlation between kubernetes and podman. Fixes: #9132 Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #9144 from vrothberg/fix-9134OpenShift Merge Robot2021-01-29
|\ \ \ \ \ | |_|_|/ / |/| | | | Revert "podman build --pull: use correct policy"
| * | | | podman build --pull: refine help message and docsValentin Rothberg2021-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine and correct the wording of the `--pull` flag in the help message and the docs. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | Revert "podman build --pull: use correct policy"Valentin Rothberg2021-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 15caebfe561952eaadd4896b7efb56f26724cce5. The previous behaviour of `--pull` to *always* attempt to pull the image and error out if the pull failed aligns with Docker. Since Podman aims at feature parity with Docker, the `--pull` behaviour must match. Fixes: #9134 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #9149 from rhatdan/docsOpenShift Merge Robot2021-01-29
|\ \ \ \ \ | |_|_|/ / |/| | | | Podman-remote push can support --format
| * | | | Podman-remote push can support --formatDaniel J Walsh2021-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix man page to document podman push --format fully. Also found that push was not handling the tlsverify so fixed this. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #9143 from cevich/static_remoteOpenShift Merge Robot2021-01-29
|\ \ \ \ \ | | | | | | | | | | | | Cirrus: Build static podman-remote
| * | | | | Cirrus: Build static podman-remoteChris Evich2021-01-28
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, the "Static Build" task only produced a `bin/podman`. Update this to also include a `bin/podman-remote` binary. Update the pr-should-include-tests checker to ignore the `nix` directory, which isn't applicable. Lastly, restore the static build task to 'required' for CI success. Leaving the comment inplace in case it needs to be bypassed in the future on short notice. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #9156 from ↵OpenShift Merge Robot2021-01-29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/image/v5-5.10.1 Bump github.com/containers/image/v5 from 5.10.0 to 5.10.1
| * | | | | Bump github.com/containers/image/v5 from 5.10.0 to 5.10.1dependabot-preview[bot]2021-01-29
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.10.0 to 5.10.1. - [Release notes](https://github.com/containers/image/releases) - [Commits](https://github.com/containers/image/compare/v5.10.0...v5.10.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #9133 from rhatdan/pull1OpenShift Merge Robot2021-01-29
|\ \ \ \ \ | |/ / / / |/| | | | Cleanup bindings for image pull
| * | | | Cleanup bindings for image pullDaniel J Walsh2021-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bindings that are not handled over the API. Leaving this one to not use image pull, since this would break progress handling. We should revisit this in the future. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #9110 from rhatdan/cgroupsOpenShift Merge Robot2021-01-28
|\ \ \ \ \ | |_|_|/ / |/| | | | Don't fail if one of the cgroups is not setup
| * | | | Don't fail if one of the cgroups is not setupDaniel J Walsh2021-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is fairly common for certain cgroups controllers to not be enabled on a system. We should Warn when this happens versus failing, when doing podman stats command. This way users can get information from the other controllers. Fixes: https://github.com/containers/podman/issues/8588 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #9140 from ↵OpenShift Merge Robot2021-01-28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/image/v5-5.10.0 Bump github.com/containers/image/v5 from 5.9.0 to 5.10.0
| * | | | | Bump github.com/containers/image/v5 from 5.9.0 to 5.10.0dependabot-preview[bot]2021-01-28
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.9.0 to 5.10.0. - [Release notes](https://github.com/containers/image/releases) - [Commits](https://github.com/containers/image/compare/v5.9.0...v5.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #9115 from rhatdan/pullOpenShift Merge Robot2021-01-28
|\ \ \ \ \ | |_|_|/ / |/| | | | Switch podman image push handlers to use abi
| * | | | Switch podman image push handlers to use abiDaniel J Walsh2021-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change API Handlers to use the same functions that the local podman uses. At the same time: Cleanup and pass proper bindings. Remove cli options from podman-remote push. Cleanup manifest push. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #8585 from Luap99/rootless-net-aliasOpenShift Merge Robot2021-01-28
|\ \ \ \ \ | |_|/ / / |/| | | | Add support for rootless network-aliases and static ip/mac
| * | | | Add support for rootless network-aliasesPaul Holzinger2021-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we pass the network aliases as capability args to the cnitool in the rootless-cni-infra container. Also update the dnsname plugin in the cni-infra container. Fixes #8567 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
| * | | | Allow static ip and mac with rootless cni networkPaul Holzinger2021-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we pass the ip and mac address as CNI_ARGS to the cnitool which is executed in the rootless-cni-infra container. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #9082 from saschagrunert/static-buildOpenShift Merge Robot2021-01-27
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix static build cache by using cachix
| * | | | Fix static build cache by using cachixSascha Grunert2021-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like we always hit the caching issue in Cirrus CI described within #8313. A solution around that is to use cachix, which has been pre-populated from my local machine. To push all (runtime and build) dependencies, we can leverage a pre-populated store by: ``` > nix-store -qR --include-outputs $(nix-instantiate nix/default.nix) | cachix push podman ``` The cache can be re-used by everybody to rapidly build static Podman binaries: https://app.cachix.org/cache/podman [NO TESTS NEEDED] Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
* | | | | Merge pull request #9127 from vrothberg/fix-9111OpenShift Merge Robot2021-01-27
|\ \ \ \ \ | | | | | | | | | | | | podman build --pull: use correct policy
| * | | | | podman build --pull: use correct policyValentin Rothberg2021-01-27
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `--pull` flag should be using the "pull if newer" pull policy rather than "pull always". This aligns with what the help message states, what Buildah does and, according to #9111, what was done before, Also add a test to prevent future regressions. Fixes: #9111 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #9105 from vrothberg/fix-8281OpenShift Merge Robot2021-01-27
|\ \ \ \ \ | |/ / / / |/| | | | remote exec: write conmon error on hijacked connection
| * | | | remote exec: write conmon error on hijacked connectionValentin Rothberg2021-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to write error from conmon on the hijacked http connection. This fixes issues where errors were not reported on the client side, for instance, when specified command was not found on the container. To future generations: I am sorry. The code is complex, and there are many interdependencies among the concurrent goroutines. I added more complexity on top but I don't have a good idea of how to reduce complexity in the available time. Fixes: #8281 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #9124 from vrothberg/fix-8358OpenShift Merge Robot2021-01-27
|\ \ \ \ \ | | | | | | | | | | | | e2e tests: synchronize test results
| * | | | | e2e tests: synchronize test resultsValentin Rothberg2021-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a mutex to synchronize the slice for storing tests results. Running the e2e tests in parallel is otherwise subject to race conditions surfacing in lost entries. Fixes: #8358 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | Merge pull request #9095 from rhatdan/psOpenShift Merge Robot2021-01-27
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | podman-remote ps --external --pod --sort do not work.
| * | | | | podman-remote ps --external --pod --sort do not work.Daniel J Walsh2021-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixup the bindings and the handling of the --external --por and --sort flags. The --storage option was renamed --external, make sure we use external up and down the stack. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>