summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Move GOPROXY from Makefile to cirrus.ymlKir Kolyshkin2022-05-17
| | | | | | | | | | | GOPROXY's default value is "https://proxy.golang.org,direct" since go 1.13, so it is redundant to set it explicitly. For some reason though, GOPROXY in Cirrus CI is set to direct, which makes things such as go mod tidy very slow. So, set the proper (default) value for in in .cirrus.yml. Do the same for GOSUMDB. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
* Makefile, podman.spec.rpkg: rm GOBIN and GOPATHKir Kolyshkin2022-05-17
| | | | | | | | | | | | | | | | | | | Remove GOPATH setting as since Go 1.9 it defaults to $HOME/go (for earlier versions it had to be specified explicitly). Remove GOPATH-related code from the spec, using relative paths when compiling packages, and enable Go modules, simplifying the spec. Remove support for multiple paths in GOPATH (which is rarely used and doesn't really work with modules). Remove setting GOBIN, rely on $GOPATH/bin instead. In case GOBIN is explicitly set (which is highly unlikely), forcefully ignore by unsetting it. Remove GOBIN from tools invocation since we added GOPATH/bin to PATH. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
* Makefile,.gitignore: rm .install.goimportsKir Kolyshkin2022-05-17
| | | | | | | | Recent commit 3b9177995e0124beb064ef8615ba9a2ae7ca4f4b removes this target, but some artifacts remain. Remove those. Fixes: 3b9177995e0124beb064ef8615ba9a2ae7ca4f4b Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
* Makefile: rm .gopathokKir Kolyshkin2022-05-17
| | | | | | | | | | Since about Go 1.10 (or whereabouts) the specific package structure is no longer required. This also removes GOPKGDIR and GOPKGBASEDIR as they were only used by gopathok. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
* Makefile: rm .install.libseccomp.sudo targetKir Kolyshkin2022-05-17
| | | | | | | | | | | | This was originally added in commit a824186ac9803ef to be used from Travis CI. Travis was removed in commit 8771a03af1f17f and there is no need to have this target ever since (October 2018). Also, remove the comment about BUILD_TAGS, which originally belonged to varlink target (removed by commit f62a356515e387b0) but got misplaced later. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
* Merge pull request #14254 from flouthoc/api-allow-remoteOpenShift Merge Robot2022-05-17
|\ | | | | api: make no-op `remote` functional in `/libpod/build`
| * api: make no-op remote functional in /libpod/buildAditya R2022-05-16
| | | | | | | | | | | | | | | | | | | | | | Podman API `libpod/build` accepts paramemter `remote` which overrides `dockerfile` but currently parameter is no-op. Following commit adds support for `remote` parameter in libpod API. See: https://docs.podman.io/en/v3.2.3/_static/api.html#operation/ImageBuildLibpod Closes: https://github.com/containers/podman/issues/13831 Signed-off-by: Aditya R <arajan@redhat.com>
* | Merge pull request #14258 from mheon/no_hard_error_on_exec_cleanupOpenShift Merge Robot2022-05-17
|\ \ | | | | | | Make errors on removing exec sessions nonfatal
| * | Make errors on removing exec sessions nonfatalMatthew Heon2022-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing exec sessions is guaranteed to evict them from the DB, but in the case of a zombie process (or similar) it may error and block removal of the container. A subsequent run of `podman rm` would succeed (because the exec sessions have been purged from the DB), which is potentially confusing to users. So let's just continue, instead of erroring out, if removing exec sessions fails. [NO NEW TESTS NEEDED] I wouldn't want to spawn a zombie in our test VMs even if I could. Fixes #14252 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #14255 from hiredman/pr-for-14249OpenShift Merge Robot2022-05-17
|\ \ \ | | | | | | | | Don't complain about XDG_RUNTIME_DIR, Closes #1424
| * | | Don't complain about XDG_RUNTIME_DIR, Closes #1424Kevin Downey2022-05-16
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code is not directly reading XDG_RUNTIME_DIR, it is reading a value in the state that may initially be from XDG_RUNTIME_DIR, but then is overriden by a value from the boltdb that podman stores some state in. XDG_RUNTIME_DIR and the RunRoot path may not have the same value, so complaining about XDG_RUNTIME_DIR here may cause confusion when trying to debug things. [NO TESTS NEEDED] Signed-off-by: Kevin Downey <hiredman@thelastcitadel.com>
* | | Merge pull request #14229 from n1hility/fix-buildtagOpenShift Merge Robot2022-05-16
|\ \ \ | |_|/ |/| | Cleanup strange buildtag edit
| * | Fix strange buildtag editJason T. Greene2022-05-13
| |/ | | | | | | Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | Merge pull request #14199 from edsantiago/parse_localbenchmarksOpenShift Merge Robot2022-05-16
|\ \ | | | | | | [CI:DOCS] Benchmarks: new tool for parsing results
| * | [CI:DOCS] Benchmarks: new tool for parsing resultsEd Santiago2022-05-11
| | | | | | | | | | | | | | | | | | | | | | | | New script for use with Valentin's benchmarks. Converts ginkgo timing results to CSV format suitable for (TBI) saving and comparing. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #14246 from n1hility/update-tutorials-indexOpenShift Merge Robot2022-05-16
|\ \ \ | | | | | | | | [CI:DOCS] Update tutorial list to include Podman for Windows
| * | | Update tutorial list to include Podman for WindowsJason T. Greene2022-05-15
| | |/ | |/| | | | | | | | | | | | | Label remote client tutorial as advanced so that users favor the managed machine approach. Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | | Merge pull request #14250 from n1hility/wsl-lingerOpenShift Merge Robot2022-05-16
|\ \ \ | | | | | | | | Update WSL machine OS to enable user lingering
| * | | Update WSL machine OS to enable user lingeringJason T. Greene2022-05-15
| |/ / | | | | | | | | | | | | | | | Also migrate old machines that were missing this setting Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | | Merge pull request #14232 from vrothberg/bz-2083997OpenShift Merge Robot2022-05-16
|\ \ \ | | | | | | | | [BZ #2083997] pod: build pause image in custom user NS
| * | | [BZ #2083997] pod: build pause image in custom user NSValentin Rothberg2022-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the host UID and host GID mapping when building the local pause image for a Pod with a custom mapping. Otherwise, the mappings are off and the build fails. Propagating the mapping to the build container is not needed since the pause image ships merely a copied `catatonit` from the host. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2083997 Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | | Merge pull request #14241 from SandroCasagrande/robust-split-proc-statOpenShift Merge Robot2022-05-16
|\ \ \ \ | |_|/ / |/| | | Robust whitespace split of cpu utilization line from /proc/stat
| * | | Robust whitespace split of cpu utilization line from /proc/statSandroCasagrande2022-05-14
|/ / / | | | | | | | | | Signed-off-by: Sandro Casagrande <sc.casagrande@gmail.com>
* | | Merge pull request #14235 from ↵Daniel J Walsh2022-05-13
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/docker/docker-20.10.16incompatible build(deps): bump github.com/docker/docker from 20.10.15+incompatible to 20.10.16+incompatible
| * | | build(deps): bump github.com/docker/dockerdependabot[bot]2022-05-13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.15+incompatible to 20.10.16+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md) - [Commits](https://github.com/docker/docker/compare/v20.10.15...v20.10.16) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #14205 from rhatdan/VENDOROpenShift Merge Robot2022-05-13
|\ \ \ | | | | | | | | Vendor in latest containers/common
| * | | Vendor in latest containers/commonDaniel J Walsh2022-05-12
| | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #14226 from edsantiago/treadmill_resetOpenShift Merge Robot2022-05-13
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Treadmill script: add --reset option
| * | | | [CI:DOCS] Treadmill script: add --reset optionEd Santiago2022-05-12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buildah got vendored into podman last week, and the script went kablooie because of ever-so-slight conflicts between what was in the treadmill PR (#13808) and what ultimately got merged (#14127) which was obviously better (hey, I tried). After a buildah vendor, there really isn't any point to keeping the treadmill commits - we're much better off just restarting with two fresh empty placeholder commits. Do so. Also, mild cleanup. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #14227 from rhatdan/testOpenShift Merge Robot2022-05-13
|\ \ \ \ | |_|/ / |/| | | Make sure tests are cleaned up when they complete
| * | | Make sure tests are cleaned up when they completeDaniel J Walsh2022-05-12
| |/ / | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/13789 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #14206 from n1hility/win-machine-eventsopenshift-ci[bot]2022-05-12
|\ \ \ | |/ / |/| | Add support for machine events on Windows
| * | Add support for machine events on WindowsJason T. Greene2022-05-12
|/ / | | | | | | Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | Merge pull request #14217 from ↵Daniel J Walsh2022-05-12
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/runc-1.1.2 build(deps): bump github.com/opencontainers/runc from 1.1.1 to 1.1.2
| * | build(deps): bump github.com/opencontainers/runc from 1.1.1 to 1.1.2dependabot[bot]2022-05-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.1.2/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.1.1...v1.1.2) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #14221 from edsantiago/fix_pwdDaniel J Walsh2022-05-12
|\ \ \ | | | | | | | | Fix broken pwd
| * | | Fix broken pwdEd Santiago2022-05-12
| | | | | | | | | | | | | | | | | | | | | | | | Broken in #14191, merged unintentionally Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #14159 from vrothberg/service-containerDaniel J Walsh2022-05-12
|\ \ \ \ | |/ / / |/| | | play kube: service container
| * | | play kube: service containerValentin Rothberg2022-05-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the notion of a "service container" to play kube. A service container is started before the pods in play kube and is (reverse) linked to them. The service container is stopped/removed *after* all pods it is associated with are stopped/removed. In other words, a service container tracks the entire life cycle of a service started via `podman play kube`. This is required to enable `play kube` in a systemd unit file. The service container is only used when the `--service-container` flag is set on the CLI. This flag has been marked as hidden as it is not meant to be used outside the context of `play kube`. It is further not supported on the remote client. The wiring with systemd will be done in a later commit. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
| * | | vendor c/common@mainValentin Rothberg2022-05-12
| | | | | | | | | | | | | | | | | | | | | | | | In hope to fix a CI flake. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | | Merge pull request #14216 from Luap99/format-completionOpenShift Merge Robot2022-05-12
|\ \ \ \ | | | | | | | | | | shell completion --format: work with pointer functions
| * | | | shell completion --format: work with pointer functionsPaul Holzinger2022-05-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The completion logic currently suggest also the functions that are defined for this type. However this did not work correctly when it was defined as pointer to that type on not the actual type. This commit fixes that problem. To test you can compare the difference between `podman stats --format {{.[TAB]` with and without this commit. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | Merge pull request #14191 from vrothberg/fix-benchmarksOpenShift Merge Robot2022-05-12
|\ \ \ \ \ | |_|_|/ / |/| | | | [CI:DOCS] fix `make localbenchmarks`
| * | | | [CI:DOCS] fix `make localbenchmarks`Valentin Rothberg2022-05-11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Since `./hack` has been removed from the Makefile's path, add it back for `make localbenchmarks` to make `podman-registry` binary available for running local registries. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | | Merge pull request #14211 from giuseppe/vendor-storage-imageOpenShift Merge Robot2022-05-12
|\ \ \ \ | | | | | | | | | | vendor: update c/storage and c/image
| * | | | vendor: update c/storage and c/imageGiuseppe Scrivano2022-05-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #14215 from vrothberg/fix-notifyOpenShift Merge Robot2022-05-12
|\ \ \ \ \ | |_|_|_|/ |/| | | | sdnotify: send MAINPID only once
| * | | | sdnotify: send MAINPID only onceValentin Rothberg2022-05-12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send the main PID only once. Previously, `(*Container).start()` and the conmon handler sent them ~simultaneously and went into a race. I noticed the issue while debugging a WIP PR. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | | Merge pull request #14209 from edsantiago/investigate_bloat_hangOpenShift Merge Robot2022-05-12
|\ \ \ \ | | | | | | | | | | Fix hang in build-each-commit test
| * | | | Fix hang in build-each-commit testEd Santiago2022-05-11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to #14178: I broke CI. "--fork-point" does not do what I thought it did, so remove it. Also, add 'set -x' to help us debug the next time something like this happens. Signed-off-by: Ed Santiago <santiago@redhat.com>