summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #4643 from adrianreber/masterOpenShift Merge Robot2019-12-17
|\ | | | | Correctly export the root file-system changes
| * Correctly export the root file-system changesAdrian Reber2019-12-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing a checkpoint with --export the root file-system diff was not working as expected. Instead of getting the changes from the running container to the highest storage layer it got the changes from the highest layer to that parent's layer. For a one layer container this could mean that the complete root file-system is part of the checkpoint. With this commit this changes to use the same functionality as 'podman diff'. This actually enables to correctly diff the root file-system including tracking deleted files. This also removes the non-working helper functions from libpod/diff.go. Signed-off-by: Adrian Reber <areber@redhat.com>
* | Merge pull request #4487 from stefanb2/topic-pr-4477OpenShift Merge Robot2019-12-17
|\ \ | | | | | | docs: add workaround for --device with rootless containers
| * | docs: add workaround for --device with rootless containersStefan Becker2019-12-17
| | | | | | | | | | | | | | | | | | Fixes #4477 Signed-off-by: Stefan Becker <chemobejk@gmail.com>
* | | Merge pull request #4681 from jvanz/issue4553OpenShift Merge Robot2019-12-17
|\ \ \ | | | | | | | | podman: mirror information
| * | | runtime.go: show registries data and search tableJosé Guilherme Vanz2019-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update podman info command to show the registries data and the search table. Signed-off-by: José Guilherme Vanz <jvanz@jvanz.com>
| * | | runtime.go: show search table in podman infoJosé Guilherme Vanz2019-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the podman info command to show registries from v1 config file in the search table format. Signed-off-by: José Guilherme Vanz <jvanz@jvanz.com>
| * | | podman info man: example updateJosé Guilherme Vanz2019-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the command output example to show information about registries and their mirrors Signed-off-by: José Guilherme Vanz <jvanz@jvanz.com>
| * | | podman: mirror informationJosé Guilherme Vanz2019-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the podman info command to show the mirror information Issue https://github.com/containers/libpod/issues/4553 Signed-off-by: José Guilherme Vanz <jvanz@jvanz.com>
* | | | Merge pull request #4701 from jvanz/opensuse-depOpenShift Merge Robot2019-12-17
|\ \ \ \ | |_|/ / |/| | | install.md: openSUSE dependencies
| * | | install.md: openSUSE dependenciesJosé Guilherme Vanz2019-12-16
| |/ / | | | | | | | | | | | | | | | Adds documentation about how to install dependencies on openSUSE Signed-off-by: José Guilherme Vanz <jvanz@jvanz.com>
* | | Merge pull request #4714 from openSUSE/testflagsOpenShift Merge Robot2019-12-16
|\ \ \ | | | | | | | | Allow the injection of TESTFLAGS
| * | | Allow the injection of TESTFLAGSSascha Grunert2019-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to specify the tests to be run, for example when setting `--focus='my-test-regex'`. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | Merge pull request #4710 from raukadah/systemdfixOpenShift Merge Robot2019-12-16
|\ \ \ \ | | | | | | | | | | Use systemd/sd-daemon.h headers for systemd presence
| * | | | Use systemd/sd-daemon.h headers for systemd presenceChandan Kumar (raukadah)2019-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finding systemd devel packages using libsystemd does not work as in RHEL based distro the package name is systemd-devel and for deb/ubunutu it is libsystemd. It is also giving false result when podman rpm is built with systemd but hack/systemd_tag.sh does not return anything. Install systemd-devel package in build_rpm.sh script Moving to systemd/sd-daemon.h header files which comes from devel packages fixes the issue. Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>
* | | | | Merge pull request #4713 from openSUSE/remove-coverprofileOpenShift Merge Robot2019-12-16
|\ \ \ \ \ | |/ / / / |/| | | | Remove coverprofile from the repository
| * | | | Remove coverprofile from the repositorySascha Grunert2019-12-16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The profile should not be part of the repo and is already in the gitignore. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | Merge pull request #4583 from nitrocode/patch-1OpenShift Merge Robot2019-12-14
|\ \ \ \ | | | | | | | | | | troubleshooting.md: added #19 not enough ids
| * | | | troubleshooting.md: rebased master and bumped 18 to 19nitrocode2019-12-13
| | |_|/ | |/| | | | | | | | | | Signed-off-by: nitrocode <nitrocode@users.noreply.github.com>
* | | | Merge pull request #4699 from mheon/fix_f31_migrationOpenShift Merge Robot2019-12-13
|\ \ \ \ | | | | | | | | | | Fix F30-F31 migration for Podman 1.7.0
| * | | | Fix F30-F31 migration for Podman 1.7.0Matthew Heon2019-12-13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earlier attempt to re-add config migration only worked with user-specified configs (podman run --config). This version works more in line with that we want - the first rootless config file will be changed from runc to crun. Verified on my system after an F31 migration - everything seems to be working well. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #4682 from raukadah/hackpathOpenShift Merge Robot2019-12-13
|\ \ \ \ | |_|/ / |/| | | Fixed the path of hack scripts in spec file
| * | | Fixed the path of hack scripts in spec fileChandan Kumar (raukadah)2019-12-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While building the spec file on fedora, in rpmbuild log, .sh: No such file or directory error is shown as full path of hack directory is not resolved leading to file not found error. Appending the builddir and libpod path with hack will fix the issue. Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>
* | | | Merge pull request #4692 from mheon/reap_exec_sessionsOpenShift Merge Robot2019-12-13
|\ \ \ \ | | | | | | | | | | Reap exec sessions on cleanup and removal
| * | | | Reap exec sessions on cleanup and removalMatthew Heon2019-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently rely on exec sessions being removed from the state by the Exec() API itself, on detecting the session stopping. This is not a reliable method, though. The Podman frontend for exec could be killed before the session ended, or another Podman process could be holding the lock and prevent update (most notable in `run --rm`, when a container with an active exec session is stopped). To resolve this, add a function to reap active exec sessions from the state, and use it on cleanup (to clear sessions after the container stops) and remove (to do the same when --rm is passed). This is a bit more complicated than it ought to be because Kata and company exist, and we can't guarantee the exec session has a PID on the host, so we have to plumb this through to the OCI runtime. Fixes #4666 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #4690 from Foxboron/morten/fix-ldflagsOpenShift Merge Robot2019-12-13
|\ \ \ \ \ | | | | | | | | | | | | [Makefile] `LDFLAGS` is reserved for the GCC linker
| * | | | | [Makefile] `LDFLAGS` is reserved for the GCC linkerMorten Linderud2019-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The env variable `LDFLAGS` belongs to the gcc linker, while the Makefile currently expects these to be valid go compiler flags. Move them to `-extldflags` as appropriate. The equivalent flag in go is `CGO_LDFLAGS`. Ensure test files are also using `LDFLAGS_PODMAN` instead of `LDFLAGS`. Signed-off-by: Morten Linderud <morten@linderud.pw>
* | | | | | Merge pull request #4491 from ↵OpenShift Merge Robot2019-12-12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.20.1+incompatible build(deps): bump github.com/uber/jaeger-client-go from 2.20.0+incompatible to 2.20.1+incompatible
| * | | | | build(deps): bump github.com/uber/jaeger-client-godependabot-preview[bot]2019-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/uber/jaeger-client-go](https://github.com/uber/jaeger-client-go) from 2.20.0+incompatible to 2.20.1+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.20.0...v2.20.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | | | Merge pull request #4677 from baude/execenvfileOpenShift Merge Robot2019-12-11
|\ \ \ \ \ \ | | | | | | | | | | | | | | allow exec to read files of environment variables
| * | | | | | allow exec to read files of environment variablesbaude2019-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we want the ability to define environment variables in files for the exec command. Fixes: #1782408 Signed-off-by: baude <bbaude@redhat.com>
* | | | | | | Merge pull request #4680 from mheon/bump-1.7.0-rc1OpenShift Merge Robot2019-12-11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Bump to v1.7.0-RC1
| * | | | | | | Bump gitvalidation epochMatthew Heon2019-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | | | | Bump to v1.7.0-devMatthew Heon2019-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | | | | Bump to v1.7.0-rc1v1.7.0-rc1Matthew Heon2019-12-11
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | | | Merge pull request #4667 from mheon/release_notes_1.6.4OpenShift Merge Robot2019-12-11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update release notes for 1.7.0
| * | | | | | | Update release notes for 1.7.0Matthew Heon2019-12-11
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | Merge pull request #4664 from baude/movefiltersOpenShift Merge Robot2019-12-11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | move image filters under libpod/images
| * | | | | | | move image filters under libpod/imagesbaude2019-12-10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to make things more effecient for the api work we are doing, we should process image filters internally (as opposed to in main). this allows for better api responses and more closely affiliated functions. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | | Merge pull request #4668 from ↵OpenShift Merge Robot2019-12-11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/psgo-1.4.0 build(deps): bump github.com/containers/psgo from 1.3.2 to 1.4.0
| * | | | | | docs: update podman-{pod-,}top man pagesValentin Rothberg2019-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c/psgo added a new `stime` descriptor. Mention that in the man page and refer to podman-top(1) in podman-pod-top(1) to avoid redundancy. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | | | build(deps): bump github.com/containers/psgo from 1.3.2 to 1.4.0dependabot-preview[bot]2019-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/psgo](https://github.com/containers/psgo) from 1.3.2 to 1.4.0. - [Release notes](https://github.com/containers/psgo/releases) - [Commits](https://github.com/containers/psgo/compare/v1.3.2...v1.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | | Merge pull request #4674 from mheon/readd_fedora_migrationOpenShift Merge Robot2019-12-11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Re-add Fedora 31 migration code.
| * | | | | | Re-add Fedora 31 migration code.Matthew Heon2019-12-10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the process, make everything in the config omitempty in TOML. We're seeing issues (notably [1]) where, after rewriting libpod.conf, fields that were not previously populated are written - and, because they were not previously written, they are included as empty. This is unfortunately different from not included at all - it means that we need to assume the user explicitly unset the value, and we can't use defaults. Setting omitempty prevents us from writing things that should not be written as they were not set originally. [1] https://github.com/containers/libpod/issues/4210 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | Merge pull request #4675 from mheon/update_cstorage_1153OpenShift Merge Robot2019-12-11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update containers/storage to v1.15.3
| * | | | | Update containers/storage to v1.15.3Matthew Heon2019-12-10
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | Merge pull request #4517 from baude/macvlanOpenShift Merge Robot2019-12-09
|\ \ \ \ \ | |_|_|/ / |/| | | | macvlan networks
| * | | | macvlan networksbaude2019-12-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the ability to a macvlan network with podman network create. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #4657 from jdieter/fix-runtime-path-when-rootOpenShift Merge Robot2019-12-07
|\ \ \ \ \ | | | | | | | | | | | | Return empty runtime directory if we're not rootless
| * | | | | Return empty runtime directory if we're not rootlessJonathan Dieter2019-12-07
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we return a runtime directory of the form `/run/user/<uid>`, even when running as root. Depending on configuration, that directory may be deleted when the user logs out, which is quite awkward when the container is started as a systemd service and then someone logs in and out as root. This patch fixes the problem by returning an empty runtime directory if the container is being started by root. The runtime should automatically use the default runtime directory (`/run/crun` when crun is used), which should be accessible to root. Tested in Fedora 31 by running containers under both root and a regular user. State for root containers is stored in `/run/crun`, while state for rootless containers is in `/run/user/<uid>/crun`. Signed-off-by: Jonathan Dieter <jdieter@gmail.com>