summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* populate resolv.conf with dnsname responses when in usernamespaceBrent Baude2020-02-20
| | | | | | | | when using usernamespace, dnsname respondes from cni were not making it into the containers /etc/resolv.conf because of a timing issue. this corrects that behavior. Fixes: #5256 Signed-off-by: Brent Baude <bbaude@redhat.com>
* Merge pull request #5275 from ↵OpenShift Merge Robot2020-02-20
|\ | | | | | | | | containers/dependabot/go_modules/github.com/spf13/cobra-0.0.6 build(deps): bump github.com/spf13/cobra from 0.0.5 to 0.0.6
| * build(deps): bump github.com/spf13/cobra from 0.0.5 to 0.0.6Daniel J Walsh2020-02-20
| | | | | | | | | | | | | | | | | | Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 0.0.5 to 0.0.6. - [Release notes](https://github.com/spf13/cobra/releases) - [Commits](https://github.com/spf13/cobra/compare/0.0.5...v0.0.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #5274 from ↵OpenShift Merge Robot2020-02-20
|\ \ | |/ |/| | | | | containers/dependabot/go_modules/github.com/stretchr/testify-1.5.1 build(deps): bump github.com/stretchr/testify from 1.5.0 to 1.5.1
| * build(deps): bump github.com/stretchr/testify from 1.5.0 to 1.5.1dependabot-preview[bot]2020-02-20
| | | | | | | | | | | | | | | | | | Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.5.0...v1.5.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #5253 from rhatdan/buildahOpenShift Merge Robot2020-02-20
|\ \ | | | | | | Update to the latest version of buildah
| * | Update to the latest version of buildahDaniel J Walsh2020-02-19
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #5241 from mheon/pod_network_opts_addOpenShift Merge Robot2020-02-20
|\ \ \ | | | | | | | | Add network opts to pods
| * | | Add network options to podman pod createMatthew Heon2020-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables most of the network-related functionality from `podman run` in `podman pod create`. Custom CNI networks can be specified, host networking is supported, DNS options can be configured. Also enables host networking in `podman play kube`. Fixes #2808 Fixes #3837 Fixes #4432 Fixes #4718 Fixes #4770 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Add ability for pods to use the host networkMatthew Heon2020-02-17
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #5265 from edsantiago/batsOpenShift Merge Robot2020-02-20
|\ \ \ \ | |_|_|/ |/| | | New login and push tests
| * | | New login and push testsEd Santiago2020-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test podman login/logout, login with wrong credentials, auth file contents, auth file path override, push/pull, and, if skopeo is installed, credentials sharing Fixes: #4283 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #5267 from edsantiago/swagger_fixesOpenShift Merge Robot2020-02-20
|\ \ \ \ | | | | | | | | | | Swagger: fix one incorrect comment
| * | | | Swagger: fix one incorrect commentEd Santiago2020-02-19
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #5235 updated a bunch of entrypoints from {name} to {name:.*}, requiring matching changes to swagger comments. Looks like one got missed due to the manual nature of this work. Have I mentioned lately that manual maintenance of duplicate information is not a great idea? Discrepancy caught by my script, which I would really like to look into getting into CI, but is gating on #5238. (I would actually not like to get this script into CI, I would prefer to have the duplicate information be autogenerated from the function calls themselves, but I seem to have lost that battle) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #5204 from baude/apiv2createlibpodOpenShift Merge Robot2020-02-19
|\ \ \ \ | |_|_|/ |/| | | apiv2 container create using specgen
| * | | apiv2 container create using specgenBrent Baude2020-02-19
|/ / / | | | | | | | | | | | | | | | this uses the specgen structure to create containers rather than the outdated createconfig. right now, only the apiv2 create is wired up. eventually the cli will also have to be done. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #5258 from ↵OpenShift Merge Robot2020-02-19
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.16.0 build(deps): bump github.com/containers/storage from 1.15.8 to 1.16.0
| * | | build(deps): bump github.com/containers/storage from 1.15.8 to 1.16.0dependabot-preview[bot]2020-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.15.8 to 1.16.0. - [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.15.8...v1.16.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #5259 from schubter/apiv2-create-imageOpenShift Merge Robot2020-02-19
|\ \ \ \ | | | | | | | | | | APIv2: Fixed CreateImageFromImage not respecting supplied Tag parameter
| * | | | Fixed CreateImageFromImage not respecting supplied Tag parameterAndreas Schubert2020-02-19
| |/ / / | | | | | | | | | | | | Signed-off-by: Andreas Schubert <schubter@gmail.com>
* | | | Merge pull request #5257 from ↵OpenShift Merge Robot2020-02-19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/stretchr/testify-1.5.0 build(deps): bump github.com/stretchr/testify from 1.4.0 to 1.5.0
| * | | | build(deps): bump github.com/stretchr/testify from 1.4.0 to 1.5.0dependabot-preview[bot]2020-02-19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.4.0 to 1.5.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.4.0...v1.5.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #5225 from vrothberg/fix-5087OpenShift Merge Robot2020-02-19
|\ \ \ \ | |_|/ / |/| | | config: use built-in TOML merge and adhere to label setting
| * | | libpod.conf: clarify `label` descriptionValentin Rothberg2020-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that the label option sets the defaults which can still be overriden by the CLI. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | set process labels in pkg/specValentin Rothberg2020-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the (default) process labels in `pkg/spec`. This way, we can also query libpod.conf and disable labeling if needed. Fixes: #5087 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | libpod/config: use built-in TOML instead of manually mergingValentin Rothberg2020-02-19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Instead of manually merging the configs, use the built-in features of TOMP to merge/extend the fields of a data type when encoding a file. This erases the need for the merge code in libpod/config and also addresses issues when merging booleans. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #5248 from rhatdan/precommitOpenShift Merge Robot2020-02-19
|\ \ \ | | | | | | | | Add installation of pre-commit to Makefile
| * | | Add installation of pre-commit to MakefileDaniel J Walsh2020-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pre-commit is required for running certain tests by the Makefile. Adding pre-commit to install.tools allows users to easily use and test podman. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #5261 from schubter/killContainerOpenShift Merge Robot2020-02-19
|\ \ \ \ | | | | | | | | | | Fixed typo in KillContainer
| * | | | Fixed typo in KillContainerAndreas Schubert2020-02-19
| | |/ / | |/| | | | | | | | | | Signed-off-by: Andreas Schubert <schubter@gmail.com>
* | | | Merge pull request #5233 from QiWang19/login/out-parameterOpenShift Merge Robot2020-02-19
|\ \ \ \ | |/ / / |/| | | fix mandatory parameter in login/logout
| * | | fix mandatory parameter in login/logoutQi Wang2020-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #5146 Insted of using a registry as mandatory parameter, this path allows podman to use the first registry from registries.conf. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | Merge pull request #5247 from schubter/5242OpenShift Merge Robot2020-02-19
|\ \ \ \ | |_|/ / |/| | | APIv2: fixes decoder issue
| * | | adds missing query struct tags and exports the fieldsAndreas Schubert2020-02-18
| | | | | | | | | | | | | | | | Signed-off-by: Andreas Schubert <schubter@gmail.com>
* | | | Merge pull request #5243 from Akasurde/misc_typoOpenShift Merge Robot2020-02-18
|\ \ \ \ | | | | | | | | | | Misc typo fixes
| * | | | Misc typo fixesAbhijeet Kasurde2020-02-18
| |/ / / | | | | | | | | | | | | Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
* | | | Merge pull request #5245 from giuseppe/rootless-portmapping-detachOpenShift Merge Robot2020-02-18
|\ \ \ \ | | | | | | | | | | rootless: fix a regression when using -d
| * | | | rootless: fix a regression when using -dGiuseppe Scrivano2020-02-18
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using -d and port mapping, make sure the correct fd is injected into conmon. Move the pipe creation earlier as the fd must be known at the time we create the container through conmon. Closes: https://github.com/containers/libpod/issues/5167 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #5231 from edsantiago/swagger_fixesOpenShift Merge Robot2020-02-18
|\ \ \ \ | | | | | | | | | | Swagger: fix inconsistencies (try #2)
| * | | | Swagger: fix inconsistencies (try #2)Ed Santiago2020-02-18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As I've mentioned once or twice, hand-maintained swagger docs are evil. This commit attempts to fix: * Inconsistent methods (swagger says POST but code signature says GET) * Inconsistent capitalization * Typos ("Mounter", "pood") * Completely wrong paths (/inspect vs /json) * Missing .Method() registrations * Missing /libpod in some /volumes paths * Incorrect method declaration: /libpod/containers/.../kill was correct (POST) in swagger but wrong in the code itself (http.MethodGet). Correct the latter to MethodPost This is two hours' work, even with a script I have that tries to cross-check everything. Swagger docs should not be human-maintained. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #5235 from jwhonce/issues/5229OpenShift Merge Robot2020-02-18
|\ \ \ \ | |_|/ / |/| | | Update mux rules to allow slashes in image names
| * | | Update mux rules to allow slashes in image namesJhon Honce2020-02-18
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | %2F escaping is also supported. Return better response on bad search terms Fixes #5229 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #5223 from vrothberg/ps-image-idOpenShift Merge Robot2020-02-18
|\ \ \ | | | | | | | | podman-ps: support image IDs
| * | | podman-ps: support image IDsValentin Rothberg2020-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Support printing image IDs via `--format "{{.ImageID}}"`. Fixes: #5160 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #5158 from jwhonce/issues/5151OpenShift Merge Robot2020-02-18
|\ \ \ \ | |_|/ / |/| | | Fix handler and systemd activation errors
| * | | Fix handler and systemd activation errorsJhon Honce2020-02-17
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On panic from handler: log warning and stack trace, report InternalServerError to client When using `podman system service` make determining the listening endpoint deterministic. // When determining _*THE*_ listening endpoint -- // 1) User input wins always // 2) systemd socket activation // 3) rootless honors XDG_RUNTIME_DIR // 4) if varlink -- adapter.DefaultVarlinkAddress // 5) lastly adapter.DefaultAPIAddress Fixes #5150 Fixes #5151 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #5237 from giuseppe/check-for-valid-conmon-processOpenShift Merge Robot2020-02-17
|\ \ \ | |/ / |/| | rootless: check if the conmon process is valid
| * | rootless: check if the conmon process is validGiuseppe Scrivano2020-02-17
| | | | | | | | | | | | | | | | | | | | | | | | if the pause process doesn't exist and we try to join a conmon namespace, make sure the process still exists. Otherwise re-create the user namespace. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #5093 from openSUSE/image-treeOpenShift Merge Robot2020-02-17
|\ \ \ | |/ / |/| | Refactor image tree for API usage
| * | Refactor image tree for API usageSascha Grunert2020-02-17
|/ / | | | | | | Signed-off-by: Sascha Grunert <sgrunert@suse.com>