summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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 #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>
* | | | Merge pull request #4440 from edsantiago/batsOpenShift Merge Robot2019-12-06
|\ \ \ \ | | | | | | | | | | test for #3920 (improper caching of tarballs in build)
| * | | | test for #3920 (improper caching of tarballs in build)Ed Santiago2019-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/containers/buildah/pull/1955 I've confirmed that this test fails under podman-1.6.2-2.fc30 and passes under current master. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #4563 from mheon/fix_change_parsingOpenShift Merge Robot2019-12-06
|\ \ \ \ \ | | | | | | | | | | | | Fix parsing for arrays of values in image changes
| * | | | | Add ONBUILD support to --changeMatthew Heon2019-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return types had to change a bit for this, but since we can wrap the old v1.ImageConfig, changes are overall not particularly bad. At present, I believe this only works with commit, not import. This matches how things were before we changed to the new parsing so I think this is fine. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | Move Commit() to new parsing for --changeMatthew Heon2019-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out we had two independent parsing impkementations for Dockerfile instructions out of --change. My previous commit fixed the one used in --change, but as I discovered to my dismay, commit used a different implementation. Remove that and use the new parsing implementation instead. While we're at it, fix some bugs in the current commit code. The addition of anonymous named volumes to Libpod recently means we can now include those in the image config when committing. Some changes (VOLUME, ENV, EXPOSE, LABEL) previously cleared the config of the former image when used; Docker does not do this, so I removed that behavior. Still needs fixing: the new implementation does not support ONBUILD, while the old one did. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | | Completely rework --change parsingMatthew Heon2019-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way we were trying to parse was very broken. I originally attempted to use Buildah's Dockerfile parser here, but dealing with it (and convincing it to accept only a limited subset, and only one instruction at a time) was challenging, so I rewrote a subset of Dockerfile parsing. This should handle most common cases well, though there are definitely unhandled edge cases for ENV and LABEL. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | Merge pull request #4651 from marcov/detach-configOpenShift Merge Robot2019-12-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use terminal detach keys sequence specified in the config file
| * | | | | | Use terminal detach keys sequence specified in the config fileMarco Vedovati2019-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #4556 Signed-off-by: Marco Vedovati <mv@sba.lat>
* | | | | | | Merge pull request #4652 from ↵OpenShift Merge Robot2019-12-06
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.15.2 build(deps): bump github.com/containers/storage from 1.15.0 to 1.15.2
| * | | | | | build(deps): bump github.com/containers/storage from 1.15.0 to 1.15.2dependabot-preview[bot]2019-12-06
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.15.0 to 1.15.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.15.0...v1.15.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | Merge pull request #4601 from ssbarnea/fix/test-build-rpm-changesOpenShift Merge Robot2019-12-05
|\ \ \ \ \ \ | | | | | | | | | | | | | | Enable multi-platform rpm building
| * | | | | | Enable multi-platform rpm buildingSorin Sbarnea2019-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make: fix python detection for multiple interpreters - make: create generic `package` and `package-install` targets - build_rpm.sh: move package installation into package-install - build_rpm.sh: fix dnf/yum detection - build_rpm.sh: install md2man rpm only on platfroms where is available - build_rpm.sh: temporary skip packaging docs and debug on rhel-8 - docs: `make package-install` This change is validated by new CI jobs run by rdoproject. See link below for result. Depends-On: https://review.rdoproject.org/r/#/c/23943/ Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
* | | | | | | Merge pull request #4639 from giuseppe/fix-stats-podOpenShift Merge Robot2019-12-05
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | libpod: fix stats for rootless pods
| * | | | | | | rootless: enable stats test on cgroup v2Giuseppe Scrivano2019-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | | libpod: fix stats for rootless podsGiuseppe Scrivano2019-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honor the systemd parent directory when specified. Closes: https://github.com/containers/libpod/issues/4634 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | | | Merge pull request #4638 from ssbarnea/fix/detachOpenShift Merge Robot2019-12-05
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Avoid git warnings by using detach on checkout
| * | | | | | | Avoid git warnings by using detach on checkoutSorin Sbarnea2019-12-04
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git displays a huge and confusing warning when doing a checkout of a specific commit if the --detach option is not mentioned. This cleans up our build logs, making it easier to spot real problems. Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
* | | | | | | Merge pull request #4642 from TomSweeneyRedHat/dev/tsweeney/buildah1.11.5OpenShift Merge Robot2019-12-05
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Bump Buildah to v1.11.6
| * | | | | | Bump Buildah to v1.11.6TomSweeneyRedHat2019-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | | | Merge pull request #4644 from ssbarnea/fix/hack-releaseOpenShift Merge Robot2019-12-05
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Improve hack/get_release_info.sh
| * | | | | | Improve hack/get_release_info.shSorin Sbarnea2019-12-04
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adopt bash strict mode - Avoid cd errors as seen on CI vendor jobs: hack/get_release_info.sh: line 9: cd: /go/src/github.com/containers/libpod: No such file or directory Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
* | | | | | Merge pull request #4640 from ssbarnea/fix/dnfOpenShift Merge Robot2019-12-04
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Improve dnf tests inside build_rpm.sh
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-08 10:29:59 +0000