summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #6715 from mheon/fix_security_exclusiveOpenShift Merge Robot2020-06-23
|\ | | | | Fix conflicts between privileged and other flags
| * Fix conflicts between privileged and other flagsMatthew Heon2020-06-22
|/ | | | | | | | The `--privileged` flag does not conflict with `--group-add` (this one was breaking Toolbox) and does not conflict with most parts of `--security-opt` (this was breaking Openstack). Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* Merge pull request #6709 from rhafer/go-versionOpenShift Merge Robot2020-06-22
|\ | | | | Bump required go version to 1.13
| * Bump required go version to 1.13Ralf Haferkamp2020-06-22
| | | | | | | | | | | | | | | | | | Recent versions of libpod use features from github.com/pkg/errors that are only available when building with go 1.13 or newer. Closes #6708 Signed-off-by: Ralf Haferkamp <rhafer@suse.com>
* | Merge pull request #6702 from jgallucci32/follow-logs-pollOpenShift Merge Robot2020-06-22
|\ \ | | | | | | Stop following logs using timers
| * | Add explicit command to alpine container in test case.jgallucci322020-06-22
| | | | | | | | | | | | Signed-off-by: jgallucci32 <john.gallucci.iv@gmail.com>
| * | Use POLL_DURATION for timerjgallucci322020-06-21
| | | | | | | | | | | | Signed-off-by: jgallucci32 <john.gallucci.iv@gmail.com>
| * | Stop following logs using timersjgallucci322020-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This incorporates code from PR #6591 and #6614 but does not use event channels to detect container state and rather uses timers with a defined wait duration before calling t.StopAtEOF() to ensure the last log entry is output before a container exits. The polling interval is set to 250 milliseconds based on polling interval defined in hpcloud/tail here: https://github.com/hpcloud/tail/blob/v1.0.0/watch/polling.go#L117 Co-authored-by: Qi Wang <qiwan@redhat.com> Signed-off-by: jgallucci32 <john.gallucci.iv@gmail.com>
* | | Merge pull request #6700 from gavincampbell/typo-fixOpenShift Merge Robot2020-06-22
|\ \ \ | | | | | | | | Typo fix
| * | | "pod" was being truncated to "po" in the names of the generated systemd unit ↵Gavin Campbell2020-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files. s/po/pod Signed-off-by: Gavin Campbell <gavin@gavincampbell.dev>
* | | | Merge pull request #6707 from lsm5/custom-GO_BUILDOpenShift Merge Robot2020-06-22
|\ \ \ \ | |_|_|/ |/| | | Makefile: allow customizable GO_BUILD
| * | | Makefile: allow customizable GO_BUILDLokesh Mandvekar2020-06-22
|/ / / | | | | | | | | | | | | | | | | | | This will let me use a customizable GO_BUILD so that I can run build targets for deb packages Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | Merge pull request #6703 from dougsland/msgOpenShift Merge Robot2020-06-22
|\ \ \ | |/ / |/| | rootless_linux: improve error message
| * | rootless_linux: improve error messageDouglas Schilling Landgraf2020-06-21
| | | | | | | | | | | | | | | | | | | | | Improve the error message for rootless mode. Git-Url: https://github.com/containers/libpod/issues/6572 Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
* | | Merge pull request #6683 from rhatdan/hostnameOpenShift Merge Robot2020-06-21
|\ \ \ | | | | | | | | Add container name to the /etc/hosts within the container
| * | | Add container name to the /etc/hosts within the containerDaniel J Walsh2020-06-20
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow containers that connect to the network namespace be able to use the container name directly. For example you can do something like podman run -ti --name foobar fedora ping foobar While we can do this with hostname now, this seems more natural. Also if another container connects on the network to this container it can do podman run --network container:foobar fedora ping foobar And connect to the original container,without having to discover the name. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #6671 from rhatdan/buildOpenShift Merge Robot2020-06-21
|\ \ \ | |_|/ |/| | Fix podman build handling of --http-proxy flag
| * | Fix podman build handling of --http-proxy flagDaniel J Walsh2020-06-19
| | | | | | | | | | | | | | | | | | Also fixed a todo for handling of cgroup manager while I was in there. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #6698 from mheon/bump_master_versionOpenShift Merge Robot2020-06-20
|\ \ \ | |_|/ |/| | [CI:DOCS] Bump master version
| * | Update release notes for v2.0.0Matthew Heon2020-06-19
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Update README to reflect that v2.0.0 has been releasedMatthew Heon2020-06-19
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Bump master to v2.1.0-dev following release of v2.0Matthew Heon2020-06-19
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #6621 from vrothberg/bz-1846629OpenShift Merge Robot2020-06-20
|\ \ \ | | | | | | | | search: allow wildcards
| * | | search: allow wildcardsValentin Rothberg2020-06-19
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow wildcards in the search term. Note that not all registries support wildcards and it may only work with v1 registries. Note that searching implies figuring out if the specified search term includes a registry. If there's not registry detected, the search term will be used against all configured "unqualified-serach-registries" in the registries.conf. The parsing logic considers a registry to be the substring before the first slash `/`. With these changes we now not only support wildcards but arbitrary input; ultimately it's up to the registries to decide whether they support given input or not. Fixes: bugzilla.redhat.com/show_bug.cgi?id=1846629 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #6676 from lsm5/tag-correctionOpenShift Merge Robot2020-06-20
|\ \ \ | | | | | | | | Account for non-default port number in image name
| * | | Account for non-default port number in image nameLokesh Mandvekar2020-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if an image was tagged with the format $REGISTRY:$PORT/$REPO:$TAG, then `podman images` would display $PORT/$REPO:$TAG under the "TAG" field. This commit correctly displays $REGISTRY:$PORT/$REPO under the "REPOSITORY" field while the "TAG" field only displays $TAG. Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> Fixes: gh#6665
* | | | Merge pull request #6675 from yhchen0906/masterOpenShift Merge Robot2020-06-20
|\ \ \ \ | |_|_|/ |/| | | correct the absolute path of `rm` executable
| * | | correct the absolute path of `rm` executableYuan-Hao Chen2020-06-19
| | |/ | |/| | | | | | | Signed-off-by: Yuan-Hao Chen <yhchen0906@gmail.com>
* | | Merge pull request #6674 from jwhonce/issues/6670OpenShift Merge Robot2020-06-19
|\ \ \ | | | | | | | | Add support for image sorting for all options
| * | | Fixes #6670Jhon Honce2020-06-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Sort images for -q option, removing duplicate id's * Sort images for --format json Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #6637 from jwhonce/issues/6574OpenShift Merge Robot2020-06-19
|\ \ \ \ | |/ / / |/| | | Correct logic for demux'ing channels
| * | | Correct logic for demux'ing channelsJhon Honce2020-06-19
|/ / / | | | | | | | | | | | | | | | * Move check for requesting output into case statement Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #6677 from baude/pollOnEventsOpenShift Merge Robot2020-06-19
|\ \ \ | |_|/ |/| | Poll on events for file reading
| * | Poll on events for file readingBrent Baude2020-06-19
| |/ | | | | | | | | | | | | | | When multiple connections are monitoring events via the remote API, the inotify in the hpcloud library seems unable to consistently send events. Switching from inotify to poll seems to clear this up. Fixes: #6664 Signed-off-by: Brent Baude <bbaude@redhat.com>
* | Merge pull request #6690 from vrothberg/fix-6687OpenShift Merge Robot2020-06-19
|\ \ | |/ |/| podman images --format json: pretty print
| * podman images --format json: pretty printValentin Rothberg2020-06-19
|/ | | | | | | | | Pretty print the JSON output when listing images. We regressed on that during v2 development. The indentation is now identical to the one of Podman v1.9.3. Fixes: #6687 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #6684 from vrothberg/fix-ciOpenShift Merge Robot2020-06-19
|\ | | | | CI: force registry:2.6
| * CI: force registry:2.6Valentin Rothberg2020-06-19
|/ | | | | | | | | | | For using the `registry:2.6` image. 2.7 and beyond dropped the `htpasswd` binary from the rootfs which parts of our CI depends on. While this is not a sustainable solution (assuming `htpasswd` is gone for ever), it unblocks the CI for now. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #6673 from ashley-cui/masterOpenShift Merge Robot2020-06-18
|\ | | | | [CI:DOCS] Fix remote docs
| * Fix remote docsAshley Cui2020-06-18
|/ | | | | | | | Fix renaming bug in remote-docs.sh Remove mentions of 'remote' in windows and mac dos Remove podman-remote.conf.5 Signed-off-by: Ashley Cui <acui@redhat.com>
* Merge pull request #6656 from mheon/recursive_initOpenShift Merge Robot2020-06-18
|\ | | | | Allow recursive dependency start with Init()
| * Allow recursive dependency start with Init()Matthew Heon2020-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of APIv2 Attach, we need to be able to attach to freshly created containers (in ContainerStateConfigured). This isn't something Libpod is interested in supporting, so we use Init() to get the container into ContainerStateCreated, in which attach is possible. Problem: Init() will fail if dependencies are not started, so a fresh container in a fresh pod will fail. The simplest solution is to extend the existing recursive start code from Start() to Init(), allowing dependency containers to be started when we initialize the container (optionally, controlled via bool). Also, update some comments in container_api.go to make it more clear how some of our major API calls work. Fixes #6646 Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #6662 from ↵OpenShift Merge Robot2020-06-18
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/k8s.io/apimachinery-0.18.4 Bump k8s.io/apimachinery from 0.18.3 to 0.18.4
| * | Bump k8s.io/apimachinery from 0.18.3 to 0.18.4Daniel J Walsh2020-06-18
| |/ | | | | | | | | | | | | | | | | Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.18.3 to 0.18.4. - [Release notes](https://github.com/kubernetes/apimachinery/releases) - [Commits](https://github.com/kubernetes/apimachinery/compare/v0.18.3...v0.18.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #6669 from vrothberg/unflake-rmiOpenShift Merge Robot2020-06-18
|\ \ | |/ |/| unflake rmi tests
| * unflake rmi testsValentin Rothberg2020-06-18
| | | | | | | | | | | | | | Make sure to always get the older images that previously committed one depends on. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #6663 from containers/dependabot/go_modules/k8s.io/api-0.18.4OpenShift Merge Robot2020-06-18
|\ \ | | | | | | Bump k8s.io/api from 0.18.3 to 0.18.4
| * | Bump k8s.io/api from 0.18.3 to 0.18.4dependabot-preview[bot]2020-06-18
| |/ | | | | | | | | | | | | | | | | Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.18.3 to 0.18.4. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](https://github.com/kubernetes/api/compare/v0.18.3...v0.18.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #6661 from ↵OpenShift Merge Robot2020-06-18
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/go.etcd.io/bbolt-1.3.5 Bump go.etcd.io/bbolt from 1.3.4 to 1.3.5
| * | Bump go.etcd.io/bbolt from 1.3.4 to 1.3.5dependabot-preview[bot]2020-06-18
| |/ | | | | | | | | | | | | | | | | Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.3.4 to 1.3.5. - [Release notes](https://github.com/etcd-io/bbolt/releases) - [Commits](https://github.com/etcd-io/bbolt/compare/v1.3.4...v1.3.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-06 07:37:45 +0000