summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #7027 from ldelossa/louis/refactor-container-configOpenShift Merge Robot2020-07-27
|\ | | | | TODO: Refactor container config
| * Refactor container configlouis2020-07-23
| | | | | | | | | | | | | | This commit handle the TODO task of breaking the Container config into smaller sub-configs Signed-off-by: ldelossa <ldelossa@redhat.com>
* | Merge pull request #7088 from vrothberg/fix-7078OpenShift Merge Robot2020-07-27
|\ \ | | | | | | API events: fix parsing error
| * | test/apiv2: add a simple events testValentin Rothberg2020-07-27
| | | | | | | | | | | | | | | | | | | | | Add a simple test to exercise the events API without the "filters" parameter. Prevents regressing on #7078. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | API events: fix parsing errorValentin Rothberg2020-07-27
| | | | | | | | | | | | | | | | | | | | | | | | Fix an error where an absent "filters" parameter led to JSON parsing errors. Fixes: #7078 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #7083 from Luap99/fix-template-escapingOpenShift Merge Robot2020-07-27
|\ \ \ | |/ / |/| | replace the html/template package with text/template
| * | replace the html/template package with text/templatePaul Holzinger2020-07-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently some commands use the html/template package. This can lead to invalid output. e.g. `system df --verbose` will print `&lt;none&gt;` instead of `<none>` with an untaged image. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #7084 from TomSweeneyRedHat/dev/tsweeney/exp_apiOpenShift Merge Robot2020-07-26
|\ \ \ | |/ / |/| | Remove 'experimental' from API doc
| * | Remove 'experimental' from API docTomSweeneyRedHat2020-07-25
|/ / | | | | | | | | | | | | | | | | The v2.0 reference [page](http://docs.podman.io/en/latest/Reference.html) lists the API as experimental. Removed that word and reworked the first paragraph a bit based on verbiage that @mheon put together for the API intro blog. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | Merge pull request #7068 from mheon/start_attach_no_ctridOpenShift Merge Robot2020-07-24
|\ \ | | | | | | The `podman start --attach` command should not print ID
| * | The `podman start --attach` command should not print IDMatthew Heon2020-07-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somewhere in the Podman v2 rewrite, we allowed `podman start --attach` to print the container ID of the started container after exiting from the attach session (via detach key or the container exiting naturally). We should never print the ID when `--attach` is given, which makes the fix simple - make the print statement conditional on `--attach` not being present. Wierdly, this only happened with `--interactive` was given to `podman start`. I don't know why that is, but this resolves the issue without having to dig any deeper, so I'm content. Fixes #7055 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #6742 from ↵OpenShift Merge Robot2020-07-24
|\ \ \ | | | | | | | | | | | | | | | | maybe-sybr/maybe/apiv2/fix-container-create-with-volumes APIv2:fix: Get volumes from `Binds` when creating
| * | | APIv2:fix: Get volumes from `Binds` when creatingmaybe-sybr2020-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change ensures that we pull volume bind specification strings from the correct spot in the POSTed data when creating containers. We should probably canity check that the mapping keys in `Volumes` are a superset of the binds listed in `HostConfig.Binds` but this cheap change removes an annoying behaviour where named volumes or host mount would be silently replaced with newly created anonymous volumes. Signed-off-by: Matt Brindley <58414429+maybe-sybr@users.noreply.github.com>
* | | | Merge pull request #6938 from jwhonce/wip/n-connectionOpenShift Merge Robot2020-07-24
|\ \ \ \ | | | | | | | | | | Refactor podman system connection
| * | | | [WIP] Refactor podman system connectionJhon Honce2020-07-22
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support to manage multiple connections * Add connection * Remove connection * Rename connection * Set connection as default * Add markdown/man pages * Fix recursion in hack/xref-helpmsgs-manpages Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #7041 from jkonowitch/reset-docsOpenShift Merge Robot2020-07-24
|\ \ \ \ | | | | | | | | | | Improve Docs for `podman system reset`
| * | | | Update system.rstJeffrey Konowitch2020-07-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeffrey Konowitch <jeff.konowitch@onepeloton.com> Update podman-system-reset.1.md Signed-off-by: Jeffrey Konowitch <jeff.konowitch@onepeloton.com> PR feedback Signed-off-by: Jeffrey Konowitch <jeff.konowitch@onepeloton.com> remove errant punctuation Signed-off-by: Jeffrey Konowitch <jeff.konowitch@onepeloton.com>
* | | | | Merge pull request #7072 from eriksjolund/doc_fix_podman_runOpenShift Merge Robot2020-07-23
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Fix exit code example in podman-run.1.md
| * | | | | Fix exit code example in podman-run.1.mdErik Sjölund2020-07-23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | | | | | Merge pull request #7071 from mheon/bump_master_to_203OpenShift Merge Robot2020-07-23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [CI:DOCS] Update release notes and README on master for v2.0.3
| * | | | | Update release notes and README on master for v2.0.3Matthew Heon2020-07-23
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #7063 from ↵OpenShift Merge Robot2020-07-23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/common-0.17.1 Bump github.com/containers/common from 0.17.0 to 0.17.1
| * | | | | Bump github.com/containers/common from 0.17.0 to 0.18.0dependabot-preview[bot]2020-07-23
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/common](https://github.com/containers/common) from 0.17.0 to 0.18.0. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.17.0...v0.18.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | Merge pull request #7066 from lpmitchell/patch-1OpenShift Merge Robot2020-07-23
|\ \ \ \ \ | | | | | | | | | | | | Fix typos on documentation 'What is Podman' page
| * | | | | Fix typos on documentation 'What is Podman' pageLuke Mitchell2020-07-23
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added a space between 'containers' and 'this' in the opening paragraph - comming -> coming - 'looking our' -> 'looking at our' Signed-off-by: Luke Mitchell <luke@lpmitchell.com>
* | | | | Merge pull request #7064 from edsantiago/fix_rootless_permsOpenShift Merge Robot2020-07-23
|\ \ \ \ \ | |/ / / / |/| | | | CI: fix rootless permission error
| * | | | CI: fix rootless permission errorEd Santiago2020-07-23
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI runs are failing in special_testing_rootless: mkdir /var/tmp/go/pkg: permission denied Probable cause: #6822, which universally set GOPATH. Solution: in rootless setup, chown -R GOPATH as well as GOSRC (the latter was already being chowned). Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #7042 from rhatdan/remoteOpenShift Merge Robot2020-07-22
|\ \ \ \ | | | | | | | | | | Enable --remote flag
| * | | | Enable --remote flagDaniel J Walsh2020-07-21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #7053 from ashley-cui/kubeipOpenShift Merge Robot2020-07-22
|\ \ \ \ \ | | | | | | | | | | | | Publish IP from YAML (podman play kube)
| * | | | | Publish IP from YAML (podman play kube)Ashley Cui2020-07-22
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | podman play kube didn't set host ip correctly from YAML Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | | Merge pull request #7050 from edsantiago/logformat_trim_remoteOpenShift Merge Robot2020-07-22
|\ \ \ \ \ | | | | | | | | | | | | logformatter: handle podman-remote
| * | | | | logformatter: handle podman-remoteEd Santiago2020-07-22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops! Logs of podman-remote tests are unreadable, they have multiple (useless) --remote options plus '--url /something/long' that makes it impossible to read the actual command being run. This commit strips off '--remote' entirely, and hides '--url' and its arg in the only-on-mouse-hover '[options]' text. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #7048 from rhatdan/remotetestOpenShift Merge Robot2020-07-22
|\ \ \ \ \ | | | | | | | | | | | | Turn on a bunch more remote tests
| * | | | | Turn on a bunch more remote testsDaniel J Walsh2020-07-22
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | We need to be more specific about the remote tests we turn off. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #7047 from edsantiago/ci_login_flake_fixOpenShift Merge Robot2020-07-22
|\ \ \ \ \ | | | | | | | | | | | | CI: attempt to fix flake in login test
| * | | | | CI: attempt to fix flake in login testEd Santiago2020-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #5212 ...or at least I hope it does. The symptom seems to be that INTEGRATION_ROOT is not being defined in some code flows. This PR blindly implements a suggestion from Miloslav, setting INTEGRATION_ROOT in one more place. We won't actually know for a long time if this works or not, because the test failure is a flake. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #6822 from cevich/add_htpasswdOpenShift Merge Robot2020-07-22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Cirrus: Add packages that provide htpasswd
| * | | | | Cirrus: Switch to freshly built imageChris Evich2020-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: The libpod -> podman change in the image name comes by way of an intentional repository rename. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus: Add packages that provide htpasswdChris Evich2020-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly needed for buildah testing: the htpasswd command was removed from the upstream registry container image. Making it available on the host-side enables configuring details needed by the registry during it's initial setup. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus: Ensure GOPATH is properly set during image-buildsChris Evich2020-07-22
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #6992 from rhatdan/apparmorOpenShift Merge Robot2020-07-22
|\ \ \ \ \ | |/ / / / |/| | | | Support default profile for apparmor
| * | | | Support default profile for apparmorDaniel J Walsh2020-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently you can not apply an ApparmorProfile if you specify --privileged. This patch will allow both to be specified simultaniosly. By default Apparmor should be disabled if the user specifies --privileged, but if the user specifies --security apparmor:PROFILE, with --privileged, we should do both. Added e2e run_apparmor_test.go Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #6955 from edsantiago/logformatter_fix_bucket_nameOpenShift Merge Robot2020-07-22
|\ \ \ \ \ | | | | | | | | | | | | logformatter: update MAGIC BLOB string
| * | | | | logformatter: update MAGIC BLOB stringEd Santiago2020-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fallout from libpod->podman repo name move: the HTML logs created by logformatter are no longer accessible. They render as: https://storage.googleapis.com/SECRET-5385732420009984-fcae48/artifacts/containers/podman/6313596734930944/html/integration_test.log.html (yes, "SECRET" instead of "cirrus-ci". Possibly because the GCE_SSH_USERNAME key, "cirrus-ci", was overzealously encrypted, making Cirrus censor any instances of the string in output. Let's see if this fixes it. But anyway this is a secondary unrelated bug). Reason: it looks like Cirrus "generated a new magic blob" when we renamed libpod -> podman. Chris was kind enough to locate the new magic blob and to give me a link to where we can discover it ourselves. I added that as a code comment. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #7044 from rhatdan/remotetestOpenShift Merge Robot2020-07-22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Enable a bunch of remote tests
| * | | | | | Enable a bunch of remote testsDaniel J Walsh2020-07-21
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #7045 from ↵OpenShift Merge Robot2020-07-22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.21.2 Bump github.com/containers/storage from 1.21.1 to 1.21.2
| * | | | | | Bump github.com/containers/storage from 1.21.1 to 1.21.2dependabot-preview[bot]2020-07-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.21.1 to 1.21.2. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.21.1...v1.21.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | | Merge pull request #7046 from ↵OpenShift Merge Robot2020-07-22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/common-0.17.0 Bump github.com/containers/common from 0.16.0 to 0.17.0
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 12:23:46 +0000