summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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>
* | Merge pull request #5218 from Jumanjii/update-go-md2man-pkg-nameOpenShift Merge Robot2020-02-17
|\ \ | |/ |/| Update documentation of commit command to show image reference is optional
| * Update documentation of commit command to show image reference is optionalAllan Jacquet-Cretides2020-02-15
| | | | | | | | | | | | | | | | | | | | | | Following Commit ba1d1304a67b ("make image reference for commit optional") Updates usage text used by cobra and markdown document used to generate MAN page. Fixes: #5145 Signed-off-by: Allan Jacquet-Cretides <allan.jacquet@gmail.com>
* | Merge pull request #5217 from mheon/rework_label_parsingOpenShift Merge Robot2020-02-15
|\ \ | |/ |/| Rework label parsing
| * Rework label parsingMatthew Heon2020-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We attempted to share all logic for parsing labels and environment variables, which on the surface makes lots of sense (both are formatted key=value so parsing logic should be identical) but has begun to fall apart now that we have added additional logic to environment variable handling. Environment variables that are unset, for example, are looked up against environment variables set for the process. We don't want this for labels, so we have to split parsing logic. Fixes #3854 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #5214 from baude/apiv2loglibpodOpenShift Merge Robot2020-02-14
|\ \ | |/ |/| apiv2 libpod container logs
| * apiv2 libpod container logsBrent Baude2020-02-14
| | | | | | | | | | | | wire up containers logs for libpod side of the house, same as compat. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | Merge pull request #5208 from ↵OpenShift Merge Robot2020-02-14
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.8.0 build(deps): bump github.com/rootless-containers/rootlesskit from 0.7.2 to 0.8.0
| * | build(deps): bump github.com/rootless-containers/rootlesskitdependabot-preview[bot]2020-02-14
| |/ | | | | | | | | | | | | | | | | Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.7.2 to 0.8.0. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.7.2...v0.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #5199 from leorochael/patch-1OpenShift Merge Robot2020-02-14
|\ \ | | | | | | Enhance fuse-overlayfs instructions.
| * | Enhance fuse-overlayfs instructions.Leonardo Rochael Almeida2020-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `fuse-overlayfs` package provided by Ubuntu up to 19.10, is not recent enough and causes errors on `buildah commit`, for instance. Adjust the rootless tutorial to point this out and to provide more detailed instructions on how to obtain `fuse-overlayfs` and configure it for use by `libpod`. Signed-off-by: Leonardo Rochael Almeida <leorochael@gmail.com>
* | | Merge pull request #5216 from baude/bindingstestcacheOpenShift Merge Robot2020-02-14
|\ \ \ | | | | | | | | add caching for binding tests
| * | | add caching for binding testsBrent Baude2020-02-14
| | |/ | |/| | | | | | | | | | | | | | | | | | | add the ability to cache images instead of pull them. makes tests faster and less network use when we flip on CI. Also added list images with filter test Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #5207 from rhatdan/selinuxOpenShift Merge Robot2020-02-14
|\ \ \ | | | | | | | | Fix SELinux labels of volumes
| * | | Fix SELinux labels of volumesDaniel J Walsh2020-02-13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we attempt to label a volume and the file system does not support labeling, then just warn. SELinux may or may not work, on the volume. There is no way to setup a private label on a newly created volume without using the container mountlabel. If we don't have a mount label at the time of creation of the volume, the only option we have is to create a shared label. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #5209 from vrothberg/un-dockerOpenShift Merge Robot2020-02-14
|\ \ \ | | | | | | | | Undocker part 1)
| * | | add pkg/signalValentin Rothberg2020-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pkg/signal to deal with parts of signal processing and translating signals from string to numeric representations. The code has been copied from docker/docker (and attributed with the copyright) but been reduced to only what libpod needs (on Linux). Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | add pkg/capabilitiesValentin Rothberg2020-02-14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Add pkg/capabibilities to deal with capabilities. The code has been copied from Docker (and attributed with the copyright) but changed significantly to only do what we really need. The code has also been simplified and will perform better due to removed redundancy. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #5203 from QiWang19/disable-detach-keyOpenShift Merge Robot2020-02-14
|\ \ \ | | | | | | | | fix bug "" disable detach keys