summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #4090 from vrothberg/build-catatonitOpenShift Merge Robot2019-10-01
|\ | | | | Build catatonit
| * catatonit: clone and buildValentin Rothberg2019-09-25
| | | | | | | | | | | | | | | | Instead of unconditionally pulling the x86 binary, clone the repository and build the binary to make it independent of the architecture. Fixes: #2699 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * bump catatonit to v0.1.4Valentin Rothberg2019-09-25
| | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #4155 from mheon/bump-1.6.0OpenShift Merge Robot2019-10-01
|\ \ | | | | | | Bump to v1.6.0
| * | Bump gitvalidation epochMatthew Heon2019-09-30
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Bump to v1.6.1-devMatthew Heon2019-09-30
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Bump to v1.6.0v1.6.0Matthew Heon2019-09-30
|/ / | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #4153 from mheon/release_notes_1.6.0_finalOpenShift Merge Robot2019-09-30
|\ \ | | | | | | Finalize release notes for v1.6.0 final
| * | Finalize release notes for 1.6.0 finalMatthew Heon2019-09-30
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #4141 from giuseppe/add-cgroups-infoOpenShift Merge Robot2019-09-30
|\ \ \ | | | | | | | | info: add cgroups2
| * | | info: add cgroups2Giuseppe Scrivano2019-09-30
| | | | | | | | | | | | | | | | | | | | | | | | Closes: https://github.com/containers/libpod/issues/4080 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #4144 from ↵OpenShift Merge Robot2019-09-30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/spf13/pflag-1.0.5 Bump github.com/spf13/pflag from 1.0.3 to 1.0.5
| * | | | Bump github.com/spf13/pflag from 1.0.3 to 1.0.5dependabot-preview[bot]2019-09-30
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/spf13/pflag](https://github.com/spf13/pflag) from 1.0.3 to 1.0.5. - [Release notes](https://github.com/spf13/pflag/releases) - [Commits](https://github.com/spf13/pflag/compare/v1.0.3...v1.0.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #4149 from ↵OpenShift Merge Robot2019-09-30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/ginkgo-1.10.1 Bump github.com/onsi/ginkgo from 1.8.0 to 1.10.1
| * | | | Bump github.com/onsi/ginkgo from 1.8.0 to 1.10.1dependabot-preview[bot]2019-09-30
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.8.0 to 1.10.1. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v1.8.0...v1.10.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #4087 from cevich/intended_env_varOpenShift Merge Robot2019-09-30
|\ \ \ \ | | | | | | | | | | Cirrus: Minor, fix env. var. intention
| * | | | Cirrus: Minor, fix env. var. intentionChris Evich2019-09-27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #4145 from ↵OpenShift Merge Robot2019-09-30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.19.0+incompatible Bump github.com/uber/jaeger-client-go from 2.16.0+incompatible to 2.19.0+incompatible
| * | | | | Bump github.com/uber/jaeger-client-godependabot-preview[bot]2019-09-30
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/uber/jaeger-client-go](https://github.com/uber/jaeger-client-go) from 2.16.0+incompatible to 2.19.0+incompatible. - [Release notes](https://github.com/uber/jaeger-client-go/releases) - [Changelog](https://github.com/jaegertracing/jaeger-client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/uber/jaeger-client-go/compare/v2.16.0...v2.19.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #4148 from ↵OpenShift Merge Robot2019-09-30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/docker/docker-credential-helpers-0.6.3 Bump github.com/docker/docker-credential-helpers from 0.6.2 to 0.6.3
| * | | | | Bump github.com/docker/docker-credential-helpers from 0.6.2 to 0.6.3dependabot-preview[bot]2019-09-30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/docker/docker-credential-helpers](https://github.com/docker/docker-credential-helpers) from 0.6.2 to 0.6.3. - [Release notes](https://github.com/docker/docker-credential-helpers/releases) - [Changelog](https://github.com/docker/docker-credential-helpers/blob/master/CHANGELOG.md) - [Commits](https://github.com/docker/docker-credential-helpers/compare/v0.6.2...v0.6.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #4146 from ↵OpenShift Merge Robot2019-09-30
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/stretchr/testify-1.4.0 Bump github.com/stretchr/testify from 1.3.0 to 1.4.0
| * | | | Bump github.com/stretchr/testify from 1.3.0 to 1.4.0dependabot-preview[bot]2019-09-30
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.3.0...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #4001 from kunalkushwaha/podman-import-fixOpenShift Merge Robot2019-09-30
|\ \ \ \ | | | | | | | | | | podman import syntax fix
| * | | | new examples addedKunal Kushwaha2019-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated two examples with supported CMD and ENTRYPOINT syntax. Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
| * | | | new testcase for podman import --change addedKunal Kushwaha2019-09-27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
| * | | | syntax updated for podman import --changeKunal Kushwaha2019-09-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently, podman import change do not support syntax like - KEY val - KEY ["val"] This adds support for both of these syntax along with KEY=val Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
* | | | | Merge pull request #4143 from vrothberg/update-storageOpenShift Merge Robot2019-09-30
|\ \ \ \ \ | |_|/ / / |/| | | | update c/storage to v1.13.4
| * | | | update c/storage to v1.13.4Valentin Rothberg2019-09-30
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update generated files * ImageBigData: distinguish between no-such-image and no-such-item * ImageSize: don't get tripped up by images with no layers * tarlogger: disable raw accouting Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #4100 from cevich/cache_image_docsOpenShift Merge Robot2019-09-29
|\ \ \ \ | | | | | | | | | | Cirrus: VM Image accounting doc update
| * | | | Cirrus: VM Image accounting doc updateChris Evich2019-09-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #4028 from cevich/add_bash_completion_supportOpenShift Merge Robot2019-09-29
|\ \ \ \ \ | | | | | | | | | | | | cirrus: Add bash-completion support
| * | | | | Cirrus: Implement newly built VM imagesChris Evich2019-09-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus: Disable boottime Ubuntu package updateChris Evich2019-09-26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | cirrus: Add bash-completion supportChris Evich2019-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is fairly standard thing to have on a user's workstation, supported by podman. When installed in a VM image, then it's useful for debugging with `hack/get_ci_vm.sh` at the cost of a minor increase in disk-space. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | Merge pull request #4118 from cevich/fix_sig_proxyOpenShift Merge Robot2019-09-27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move noCache logic lower in stack
| * | | | | | Move noCache logic lower in stackChris Evich2019-09-26
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One or more tests are not taking advantage of the local image cache. This has been observed to cause a testing flake in at least one `--sigproxy` test which uses `PodmanTestIntegration.PodmanPID()`. It has a rather short timeout of 15-seconds, which isn't always enough time to pull down a remote image. Fix this by reloacing the `noCache` logic from `PodmanTest.PodmanAsUserBase()` down the stack into `PodmanTestIntegration.makeOptions()`. This also eliminates the need to also check if a remote-client is being used - since it uses a different function. Also reverse the parameter order in `PodmanTest.PodmanBase` so that everywhere is consistently `noEvents` then `noCache`. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | Merge pull request #4065 from mheon/unconditional_conmon_rmOpenShift Merge Robot2019-09-27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Unconditionally remove conmon files before starting
| * | | | | | Unconditionally remove conmon files before startingMatthew Heon2019-09-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've been seeing a lot of issues (ref: #4061, but there are others) where Podman hiccups on trying to start a container, because some temporary files have been retained and Conmon will not overwrite them. If we're calling start() we can safely assume that we really want those files gone so the container starts without error, so invoke the cleanup routine. It's relatively cheap (four file removes) so it shouldn't hurt us that much. Also contains a small simplification to the removeConmonFiles logic - we don't need to stat-then-remove when ignoring ENOENT is fine. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | Merge pull request #4126 from nalind/makefile-typoOpenShift Merge Robot2019-09-27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add a missing escape in the Makefile
| * | | | | | | Add a missing escape in the MakefileNalin Dahyabhai2019-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | | | | | | | Merge pull request #4121 from jwhonce/issue/4021OpenShift Merge Robot2019-09-27
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Change ginkgo Wait() to Eventually() test
| * | | | | | | Change ginkgo Wait() to Eventually() testJhon Honce2019-09-26
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the test in WaitWithDefaultTimeout() to use Eventually() and gexec.Exit(). Using ExitCode() before command has really exited returns a -1, which can cause issues for tests testing for podman to return non-zero values. Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | | Merge pull request #4127 from nalind/reexec-useOpenShift Merge Robot2019-09-27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Correct use of reexec.Init()
| * | | | | | | Correct use of reexec.Init()Nalin Dahyabhai2019-09-26
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A true result from reexec.Init() isn't an error, but it indicates that main() should exit with a success exit status. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | | | | | | Merge pull request #4124 from mheon/set_log_level_earlyOpenShift Merge Robot2019-09-27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Set log-level immediately, before rootless setup
| * | | | | | | Set log-level immediately, before rootless setupMatthew Heon2019-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't do this, we print WARN level messages that we should not be printing by default. Up one WARN message to ERROR so it still shows up by default. Fixes: #4115 Fixes: #4012 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | | Merge pull request #4116 from TomSweeneyRedHat/dev/tsweeney/fixtutreadmeOpenShift Merge Robot2019-09-27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make links relative in Tutorial README
| * | | | | | | | Make links relative in Tutorial READMETomSweeneyRedHat2019-09-26
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the longer html link in favor or relative links which are shorter and less error prone. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | | | | Merge pull request #4120 from mheon/secresponseOpenShift Merge Robot2019-09-27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add README note about security reporting process.