summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix contributor make targets on Ubuntu and DebianAnders F Björklund2021-09-28
| | | | | | | | It was trying to run a bash script with sh [NO TESTS NEEDED] This changes "make lint" Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* Merge pull request #11768 from vrothberg/deep-copyOpenShift Merge Robot2021-09-28
|\ | | | | libpod: do not call (*container).Config()
| * libpod: do not call (*container).Config()Valentin Rothberg2021-09-28
| | | | | | | | | | | | | | | | | | | | | | | | Access the container's config field directly inside of libpod instead of calling `Config()` which in turn creates expensive JSON deep copies. Accessing the field directly drops memory consumption of a simple `podman run --rm busybox true` from 1245kB to 410kB. [NO TESTS NEEDED] Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #11615 from cevich/pr_templateOpenShift Merge Robot2021-09-28
|\ \ | |/ |/| [CI:DOCS] Implement PR template to assist review & release
| * Implement PR template to assist review & releaseChris Evich2021-09-28
| | | | | | | | | | | | | | | | | | | | | | | | This duplicates the template used for buildah. The intention is to make it immediately clear to reviewers: * The intended/basic purpose of the PR (also machine readable) * Why are changes being proposed * If there are any specific items need additional checking or scrutiny * What should go into the release-notes (if anything). Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #11760 from rhatdan/dockerfileOpenShift Merge Robot2021-09-28
|\ \ | | | | | | Add dockerfile.5 as man link to containerfile man page
| * | Add dockerfile.5 as man link to containerfile man pageDaniel J Walsh2021-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | containers-common now ships a containerfile man page, this patch adds a link to dockerfile.5 so that if user installs podman-docker package man dockerfile will work. [NO TESTS NEEDED] since this is just a man page change. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #11751 from Luap99/net-aliasOpenShift Merge Robot2021-09-28
|\ \ \ | | | | | | | | always add short container id as net alias
| * | | move network alias validation to container createPaul Holzinger2021-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman 4.0 currently errors when you use network aliases for a network which has dns disabled. Because the error happens on network setup this can cause regression for old working containers. The network backend should not validate this. Instead podman should check this at container create time and also for network connect. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | | set --cni-config-dir for exit commandPaul Holzinger2021-09-28
| | | | | | | | | | | | | | | | Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | | always add short container id as net aliasPaul Holzinger2021-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches what docker does. Also make sure the net aliases are also shown when the container is stopped. docker-compose uses this special alias entry to check if it is already correctly connected to the network. [1] Because we do not support static ips on network connect at the moment calling disconnect && connect will loose the static ip. Fixes #11748 [1] https://github.com/docker/compose/blob/0bea52b18dda3de8c28fcfb0c80cc08b8950645e/compose/service.py#L663-L667 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | Merge pull request #11765 from vrothberg/no-dotOpenShift Merge Robot2021-09-28
|\ \ \ \ | | | | | | | | | | [CI:DOCS] cmd/podman: no dot for short descriptions
| * | | | [CI:DOCS] cmd/podman: no dot for short descriptionsValentin Rothberg2021-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing dots in the short descriptions for the sake of consistency. Noticed while parsing `podman help`. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #11762 from edsantiago/batsOpenShift Merge Robot2021-09-28
|\ \ \ \ \ | | | | | | | | | | | | System tests: speed up. They've gotten too slow.
| * | | | | System tests: speed up. They've gotten too slow.Ed Santiago2021-09-27
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - logs: remove unnecessary sleeps. This saves ~25s. Unfortunately, journald seems to have some sort of lag, so we need to keep retrying until we get the 'after' string. - ps: add placeholder test for once buildah 3544 is fixed - cp: bulk-kill containers when finished, instead of one by one. This is a big change and only saves about 8s per run, but hey. - mount,pause,healthcheck: 'podman stop -t 0' before rm'ing containers. Easy 50s. Have I mentioned, lately, that 'podman rm -f' needs a '-t 0' flag? - play: same, and also 'podman pod stop'. Seems to shave ~20s. - socket-activation: UGH! Buggy and useless tests! They were running "sleep 90" containers for no reason whatsoever. I assume the intention was to run them with "-d", so that's what I've done here. Also fixed some language. 180 seconds! (Unrelated: cleanup in 070-build, use $IMAGE, not alpine) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #11737 from vrothberg/fix-11472OpenShift Merge Robot2021-09-28
|\ \ \ \ \ | |/ / / / |/| | | | image prune: support removing external containers
| * | | | image prune: support removing external containersValentin Rothberg2021-09-28
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support removing external containers (e.g., build containers) during image prune. Fixes: #11472 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #11759 from jedieaston/msi-fixOpenShift Merge Robot2021-09-27
|\ \ \ \ | | | | | | | | | | Set MSI to be 64-bit only.
| * | | | Set MSI to be 64-bit only.Easton Pillay2021-09-27
| | |/ / | |/| | | | | | | | | | | | | | | | | | Hi there! I noticed that the MSI file built for Windows was building in 32-bit mode, even though Podman is 64-bit only. I added a flag to wixl in the Makefile to tell it to build a 64-bit MSI, and I adjusted the podman.wxs file to use the right settings for 64-bit programs. Signed-off-by: GitHub <noreply@github.com>
* | | | Merge pull request #11756 from Luap99/network-pruneOpenShift Merge Robot2021-09-27
|\ \ \ \ | | | | | | | | | | CNI: network remove do not error for ENOENT
| * | | | fix podman network prune integration test flakesPaul Holzinger2021-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The podman integration tests run in parallel. Because all tests use the same CNI config dir the podman network prune test will remove networks which are used by other tests at the moment and thus creating unexpected flakes. The solution use an extra cni config dir for the network prune test. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | | | CNI: network remove do not error for ENOENTPaul Holzinger2021-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make podman network rm more robust by checking for ENOENT if we cannot remove the config file. If it does not exists there is no reason to error. This is especially useful for podman network prune. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | Merge pull request #11702 from cevich/gitlab_runner_testOpenShift Merge Robot2021-09-27
|\ \ \ \ \ | |_|/ / / |/| | | | Cirrus: Add gitlab podman runner test
| * | | | Cirrus: Add gitlab podman runner testChris Evich2021-09-27
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add execution of the downstream gitlab-runner tests using rootless podman through the magic of socket-level docker compatibility. Include a comment suggesting how to temporarily disable the test in case it fails beyond podman code scope. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #11754 from flouthoc/podman-stop-report-non-runningOpenShift Merge Robot2021-09-27
|\ \ \ \ | | | | | | | | | | stop: Do nothing if container was never created in runtime or in a invalid state.
| * | | | stop: Do nothing if container was never created in runtimeAditya Rajan2021-09-27
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following commit ensures we silently return container id on `stop` if container was never created in OCI runtime. Following behaviour ensures that we are in parity with docker. Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | | Merge pull request #11755 from nalind/remote-build-eval-contextdirOpenShift Merge Robot2021-09-27
|\ \ \ \ | |_|/ / |/| | | remote build: EvalSymlinks() the context directory
| * | | remote build: EvalSymlinks() the context directoryNalin Dahyabhai2021-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use EvalSymlinks() to find the context directory, in case there's shenanigans. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | | | Merge pull request #11753 from vrothberg/VENDOROpenShift Merge Robot2021-09-27
|\ \ \ \ | |_|/ / |/| | | Vendor in containers/common v0.46.0
| * | | Allow machine options to be set from containers.confAshley Cui2021-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPUS, memory, disk size, and image path defaults can be set from [machine] table in containers.conf [NO TESTS NEEDED] Signed-off-by: Ashley Cui <acui@redhat.com>
| * | | Vendor in containers/common v0.46.0Daniel J Walsh2021-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/11745 [NO TESTS NEEDED] Since this is just a revendor and a one line change for the revendor Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #11752 from Luap99/machine-no-usernsOpenShift Merge Robot2021-09-27
|\ \ \ \ | |/ / / |/| | | podman machine: do not join userns
| * | | podman machine: do not join usernsPaul Holzinger2021-09-27
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The go logic already prevents podman from joining the userns for machine commands but the c shortcut code did not. [NO TESTS NEEDED] Fixes #11731 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #11609 from sankalp-r/add-healthcheck-psOpenShift Merge Robot2021-09-24
|\ \ \ | | | | | | | | added healthcheck to ps command
| * | | added healthcheck to ps commandSankalp Rangare2021-09-24
| |/ / | | | | | | | | | Signed-off-by: Sankalp Rangare <sankalprangare786@gmail.com>
* | | Merge pull request #11736 from jelly/doc_search_apiOpenShift Merge Robot2021-09-24
|\ \ \ | | | | | | | | [CI:DOCS] Document missing /images/search query parameters
| * | | Document missing /images/search query parametersJelle van der Waa2021-09-24
| |/ / | | | | | | | | | | | | | | | | | | | | | Include the tlsVerify, listTags query parameters for the compat and libpod endpoint and document the default value for the amount of results which are returned. Signed-off-by: Jelle van der Waa <jvanderwaa@redhat.com>
* | | Merge pull request #11709 from afbjorklund/machine-jsonOpenShift Merge Robot2021-09-24
|\ \ \ | | | | | | | | Add JSON version of the machine list
| * | | Add completion for machine list formatAnders F Björklund2021-09-23
| | | | | | | | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
| * | | Add JSON version of the machine listAnders F Björklund2021-09-23
| | | | | | | | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | | Merge pull request #11738 from rhatdan/docsOpenShift Merge Robot2021-09-24
|\ \ \ \ | | | | | | | | | | Fix english on prune prompt
| * | | | Fix english on prune promptDaniel J Walsh2021-09-24
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google docs found this while writing Podman in Action book. [NO TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #11733 from Luap99/xdgOpenShift Merge Robot2021-09-24
|\ \ \ \ | |_|/ / |/| | | rootful: do not set XDG_RUNTIME_DIR for cni plugins
| * | | rootful: do not set XDG_RUNTIME_DIR for cni pluginsPaul Holzinger2021-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dnsname plugin tries to use XDG_RUNTIME_DIR to store files. podman run will have XDG_RUNTIME_DIR set and thus the cni plugin can use it. The problem is that XDG_RUNTIME_DIR is unset for the conmon process for rootful users. This causes issues since the cleanup process is spawned by conmon and thus not have XDG_RUNTIME_DIR set to same value as podman run. Because of it dnsname will not find the config files and cannot correctly cleanup. To fix this we should also unset XDG_RUNTIME_DIR for the cni plugins as rootful. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | | Revert "rootful: unset XDG_RUNTIME_DIR"Paul Holzinger2021-09-24
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 91e21bed48a2ab11049ef20e9150b5be531bc50a. XDG_RUNTIME_DIR is required for the authfile path. We cannot unset it. [NO TESTS NEEDED] Fixes #11725 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #11675 from baude/playkubebuildcontextdirOpenShift Merge Robot2021-09-23
|\ \ \ | | | | | | | | Set context dir for play kube build
| * | | Set context dir for play kube buildBrent Baude2021-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When performing an image build with play kube, we need to set the context directory so things like file copies have the correct input path. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #11716 from dilyanpalauzov/makefile_go_ldflagsOpenShift Merge Robot2021-09-23
|\ \ \ \ | | | | | | | | | | Makefile: use -ldflags/-gccgoflags depending on the go implemenatiton
| * | | | Makefile: use -ldflags/-gccgoflags depending on the go implemenatitonДилян Палаузов2021-09-23
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Insisting on “DCO” imposes formalities, that serve self-purpose. One cannot assume that the submitter has time or will to read texts about symbolism in software contributions. If the system wants to see the text nrEAUIEUAIe eanuitdnuae EAIUEAUIAIE »ℓ§444.3.72b)°»°ℓ§euaieauuae in each commit, people will write this, or any other text, that the system wants to see. All such text, which presence is mandated by the system, has the same value. Signed-off-by: Дилян Палаузов <git-dpa@aegee.org>
* | | | Merge pull request #11654 from Luap99/health-dockerOpenShift Merge Robot2021-09-23
|\ \ \ \ | | | | | | | | | | podman inspect add State.Health field for docker compat
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-20 17:50:54 +0000