summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix strange buildtag editJason T. Greene2022-05-13
| | | | Signed-off-by: Jason T. Greene <jason.greene@redhat.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>
* | | | Merge pull request #14175 from giuseppe/update-toolbox-imageOpenShift Merge Robot2022-05-12
|\ \ \ \ | |/ / / |/| | | test: update fedora toolbox image
| * | | test: update fedora toolbox imageGiuseppe Scrivano2022-05-11
| |/ / | | | | | | | | | | | | | | | f32 is already EOL. Let's use the latest version. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #14198 from edsantiago/easy_manpage_fixesOpenShift Merge Robot2022-05-11
|\ \ \ | | | | | | | | [CI:DOCS] man pages: fix inconsistencies
| * | | [CI:DOCS] man pages: fix inconsistenciesEd Santiago2022-05-11
| |/ / | | | | | | | | | | | | | | | | | | | | | As part of work done in #14046, fix bugs found in man pages, basically just moving a few descriptions to the right place and removing some undesired asterisks. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #14141 from n1hility/win-docsOpenShift Merge Robot2022-05-11
|\ \ \ | |/ / |/| | [CI:DOCS] Add Windows Guide/Tutorial
| * | Add initial Windows guideJason T. Greene2022-05-10
| | | | | | | | | | | | Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | | Merge pull request #14170 from ashley-cui/machtestsOpenShift Merge Robot2022-05-11
|\ \ \ | | | | | | | | Add more machine tests
| * | | Add more machine testsAshley Cui2022-05-10
| | |/ | |/| | | | | | | | | | | | | Add more machine tests for flags in init, inspect, and list. Signed-off-by: Ashley Cui <acui@redhat.com>
* | | Merge pull request #14176 from giuseppe/test-parallel-rm-cleanupOpenShift Merge Robot2022-05-11
|\ \ \ | | | | | | | | test: simplify cleanup code
| * | | test: simplify cleanup codeGiuseppe Scrivano2022-05-10
| |/ / | | | | | | | | | | | | | | | | | | do not try to first stop and then rm but combine the two operations in a single command. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #14179 from cevich/ensure_dest_branchOpenShift Merge Robot2022-05-10
|\ \ \ | | | | | | | | Cirrus: Guarantee $DEST_BRANCH is passed through
| * | | Cirrus: Guarantee $DEST_BRANCH is passed throughChris Evich2022-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several runtime contexts (rootless and container) where `$DEST_BRANCH` is needed but was not supplied. A prior commit (c4865767171b) removed the default value, `main` which was being set incorrectly when CI ran on release branches. Fix this by ensuring the variable is non-empty upon entry to `setup_environment.sh`, then ensure it gets passed through to child environments by way of the `/etc/ci_environment` file. This will maintain compatibility with both CI and `hack/get_ci_vm.sh` use. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #14016 from cevich/fix_cachingOpenShift Merge Robot2022-05-10
|\ \ \ \ | | | | | | | | | | Cirrus: Simplify use of cache in automation
| * | | | Cirrus: Update images + new automation libraryChris Evich2022-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for new automation library version w/ `$DEBUG` fix (ref: containers/automation_images#128) and added definitions for commonly used Distro/version variables. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | Cirrus: Simplify use of cache in automationChris Evich2022-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the increasingly complex `.cirrus.yml` task relationships, build cache wasn't always working as intended. Recently, non-build tasks were observed assuming authority over `gopath_cache`. Ref.: https://github.com/containers/podman/pull/13998#issuecomment-1108834538 Address this by an overall simplification using artifacts instead of cache. Using artifacts allows establishing concrete authorship/authority over cached repo. content. In this way, dependent tasks may simply consume the artifact with `curl` instead of relying on complex caching algorithms. Also/Minor: Add YAML checking to the pre-commit configuration. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | Cirrus: Simplify rootless ssh setupChris Evich2022-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sshd service is guaranteed to be running by the VM image build process - it's required by the packer tool for access. Remove the startup and check on the sshd service. For many tests, man ssh connections to/from $ROOTLESS_USER on the host are needed. To facilitate this, the localhost key is added to `known_hosts` for root and `$ROOTLESS_USER`. Simplify this setup using the `ssh-keyscan` tool. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #14180 from cevich/fix_makefile_pathOpenShift Merge Robot2022-05-10
|\| | | | | | | | | | | | | | Cirrus: Fix Makefile including 'hack' in $PATH
| * | | | Cirrus: Fix Makefile including 'hack' in $PATHChris Evich2022-05-10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This path should never, ever, ever be included in `$PATH` as it is almost guaranteed to cause serious and non-obvious breakage in CI. Fix it and include a warning comment. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #14140 from giuseppe/play-kube-usernsOpenShift Merge Robot2022-05-10
|\ \ \ \ | |/ / / |/| | | kube: add support for --userns=[auto|host]
| * | | kube: add support for --userns=Giuseppe Scrivano2022-05-10
|/ / / | | | | | | | | | | | | | | | | | | | | | add support to override the user namespace to use for the pod. Closes: https://github.com/containers/podman/issues/7504 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #14178 from edsantiago/bloat_fixOpenShift Merge Robot2022-05-10
|\ \ \ | | | | | | | | bloat check: make more robust
| * | | bloat check: make more robustEd Santiago2022-05-10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of 'C^' (parent) in 'git rebase' is counterintuitive, at least to me: when C is a merge of multiple commits, rebase picks each of those commits. That probably makes good sense to a git expert, which I'm not. Solution: forget using '^', just calculate the baseline sizes by doing a checkout of the PR's parent. Also: compute PR parent using git-merge-base instead of blindly trusting $DEST_BRANCH (which may be volatile as other PRs are merged). Also: run git-rebase directly, not via make rule. That indirection is too confusing here. Signed-off-by: Ed Santiago <santiago@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 02:58:17 +0000