summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #8526 from alvistack/master-linux-amd64OpenShift Merge Robot2020-12-21
|\ | | | | Update nix pin with `make nixpkgs`
| * Update nix pin with `make nixpkgs`Wong Hoi Sing Edison2020-12-20
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR introduce 3 changes: - Upgrade Nix stable channel from 20.03 to 20.09. NixOS 20.09 released at 2020-10-27, see <https://nixos.org/manual/nixos/stable/release-notes.html#sec-release-20.09> for more information. - Replace `git` with `gitMinimal`. All 6 projects (i.e. crun/conmon/skopeo/buildah/podman/cri-o) are having `git` as dependency for failsafe during bootstrap. BTW <https://github.com/NixOS/nixpkgs/pull/104896> replace `asciidoc` with `asciidoctor` so trigger the dependency chain to `glib` and so failed (see below). Switching to `gitMinimal` skip this dependency chain to `glib`, which also speed up overall build process. - Adding `-pthread` for `glib` `conmon` couldn't skip the error by replacing `git` with `gitMinimal` since it do depend on `glib`. Since `glib` trigger error message "undefined reference to 'pthread\_create'", therefore adding `pthread` to `CFLAGS` could solve the problem. Also see: - <https://github.com/containers/crun/pull/550> - <https://github.com/containers/conmon/pull/218> - <https://github.com/containers/skopeo/pull/1120> - <https://github.com/containers/buildah/pull/2831> - <https://github.com/containers/podman/pull/8526> - <https://github.com/cri-o/cri-o/pull/4395> Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
* Merge pull request #8747 from vrothberg/run-950OpenShift Merge Robot2020-12-18
|\ | | | | remote copy
| * system tests: set PODMAN_TIMEOUT to 120Valentin Rothberg2020-12-18
| | | | | | | | | | | | | | | | | | | | The new Ubuntu 20.04 VMs seem very slow and fail reproducibly in a build test (i.e, "wordir, cmd, env, label"). Bumping up the time out to 120 seconds will help get the CI green. See github.com/containers/podman/pull/8747. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * remote copyValentin Rothberg2020-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement `podman-remote cp` and break out the logic from the previously added `pkg/copy` into it's basic building blocks and move them up into the `ContainerEngine` interface and `cmd/podman`. The `--pause` and `--extract` flags are now deprecated and turned into nops. Note that this commit is vendoring a non-release version of Buildah to pull in updates to the copier package. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #8767 from baude/bindings3podsOpenShift Merge Robot2020-12-18
|\ \ | |/ |/| podman v3 pod bindings
| * podman v3 pod bindingsbaude2020-12-17
| | | | | | | | | | | | add options to each pod binding for future wiggle room Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #8769 from ↵OpenShift Merge Robot2020-12-18
|\ \ | |/ |/| | | | | containers/dependabot/go_modules/github.com/containers/common-0.31.1 Bump github.com/containers/common from 0.31.0 to 0.31.1
| * Bump github.com/containers/common from 0.31.0 to 0.31.1dependabot-preview[bot]2020-12-18
|/ | | | | | | | | Bumps [github.com/containers/common](https://github.com/containers/common) from 0.31.0 to 0.31.1. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.31.0...v0.31.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #8752 from baude/bindings3volumesOpenShift Merge Robot2020-12-17
|\ | | | | misc bindings to podman v3
| * misc bindings to podman v3baude2020-12-17
| | | | | | | | | | | | | | manifest, system, info, volumes, play, and generate bindings are updated to always have binding options. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #8766 from TomSweeneyRedHat/dev/tsweeney/readnowOpenShift Merge Robot2020-12-17
|\ \ | | | | | | [CI:DOCS] Bump version on readme
| * | [CI:DOCS] Bump version on readmeTomSweeneyRedHat2020-12-17
|/ / | | | | | | | | | | | | | | | | Bump the version of Podman in the README.md to the current 2.2.1 Addresses: #8760 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | Merge pull request #8717 from rhatdan/stdinOpenShift Merge Robot2020-12-17
|\ \ | | | | | | Close the stdin/tty when using podman as a restAPI.
| * | Close the stdin/tty when using podman as a restAPI.Daniel J Walsh2020-12-17
| | | | | | | | | | | | | | | | | | | | | | | | Currently the service is attempting to prompt on shortname expansion if you run with a terminal. This change will cause the service to default to no terminal and not prompt. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8758 from mlegenovic/masterOpenShift Merge Robot2020-12-17
|\ \ \ | |_|/ |/| | Docker compat API - /images/search returns wrong structure (#7857)
| * | Docker compat API - /images/search returns wrong structure (#7857)Milivoje Legenovic2020-12-17
| |/ | | | | | | Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
* | Merge pull request #8750 from rhatdan/resetOpenShift Merge Robot2020-12-17
|\ \ | |/ |/| Don't accidently remove XDG_RUNTIME_DIR when reseting storage
| * Don't accidently remove XDG_RUNTIME_DIR when reseting storageDaniel J Walsh2020-12-16
| | | | | | | | | | | | | | | | | | | | In certain cases XDG_RUNTIME_DIR was deleted by accident based on settings in the storage.conf. This patch verifies that when doing a storage reset, we don't accidently remove XDG_RUNTIME_DIR. Fixes: https://github.com/containers/podman/issues/8680 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8756 from Luap99/fix-8748OpenShift Merge Robot2020-12-16
|\ \ | | | | | | Always add the default gateway to the cni config file
| * | Always add the default gateway to the cni config filePaul Holzinger2020-12-16
| |/ | | | | | | | | | | | | | | | | | | | | | | `podman network create` should always add a gateway to the cni config. If no gateway is given use the first ip in the subnet. CNI does not require the gateway field but we need it because of network inspect. This worked with previous version but was dropped in Commit(e7a72d72fd59). Fixes #8748 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #8738 from xatier/masterOpenShift Merge Robot2020-12-16
|\ \ | | | | | | Add support for pacman package version query
| * | Add support for pacman package version queryxatier2020-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactor package query logic to be package manager agnostic. - `pacman -Qo` is the equivalent to `rpm -qf` [1]. [1] https://wiki.archlinux.org/index.php/Pacman/Rosetta#Querying_specific_packages Signed-off-by: xatier <xatierlike@gmail.com>
* | | Merge pull request #8755 from edsantiago/batsOpenShift Merge Robot2020-12-16
|\ \ \ | |/ / |/| | System tests: better diagnostics in completion test
| * | System tests: better diagnostics in completion testEd Santiago2020-12-16
| |/ | | | | | | | | | | | | | | | | | | Tracking down a CI failure earlier today, I was slightly delayed by the absence of context information in a test failure. This PR adds full command context to each subtest, making it much easier for the developer to narrow down the cause of a failure. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #8746 from ↵OpenShift Merge Robot2020-12-16
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/selinux-1.8.0 Bump github.com/opencontainers/selinux from 1.7.0 to 1.8.0
| * | Bump github.com/opencontainers/selinux from 1.7.0 to 1.8.0dependabot-preview[bot]2020-12-16
| |/ | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/selinux](https://github.com/opencontainers/selinux) from 1.7.0 to 1.8.0. - [Release notes](https://github.com/opencontainers/selinux/releases) - [Commits](https://github.com/opencontainers/selinux/compare/v1.7.0...v1.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8753 from rhatdan/serviceOpenShift Merge Robot2020-12-16
|\ \ | |/ |/| podman.service should be an exec service not a notify service
| * podman.service should be an exec service not a notify serviceDaniel J Walsh2020-12-16
|/ | | | | | | | | | Podman never notifies sytemd that it is ready to recieve connections so systemd kills it after waiting 1.5 minutes. Changing to exec should leave it running until podman exits or the service is stopped. https://github.com/containers/podman/issues/8751 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #8312 from cevich/new_ubuntu_imagesOpenShift Merge Robot2020-12-16
|\ | | | | Cirrus: Update VM Images; Both Fedora and Ubuntu "prior" flavors run with CGroupsV1 & runc
| * Fix: unpause not supported for CGv1 rootlessChris Evich2020-12-16
| | | | | | | | | | | | Thanks Ed Santiago <santiago@redhat.com> for the fix. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Disable incompatible rootless + CGroupsV1 testsChris Evich2020-12-15
| | | | | | | | | | | | | | | | | | | | These tests simply will not work under these conditions. Note: Recently updated F32 (prior-fedora) and Ubuntu 20.04 (prior-ubuntu) VMs always use CGroupsV1 with runc. F33 and Ubuntu 20.10 were updated to always use CGroupsV2 with crun. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Disable rootless pod stats tests w/ CgroupV1Chris Evich2020-12-15
| | | | | | | | | | | | | | | | | | | | | | When running as rootless, on a CgroupV1 host these tests all report: `Error: pod stats is not supported in rootless mode without cgroups v2` Note: Recently updated F32 (prior-fedora) and Ubuntu 20.04 (prior-ubuntu) VMs always use CGroupsV1 with runc. F33 and Ubuntu 20.10 were updated to always use CGroupsV2 with crun. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Disable CGv1 pod stats on net=host postChris Evich2020-12-15
| | | | | | | | | | | | | | | | | | | | | | This should be addressed by PR https://github.com/containers/podman/pull/8685 Note: Recently updated F32 (prior-fedora) and Ubuntu 20.04 (prior-ubuntu) VMs always use CGroupsV1 with runc. F33 and Ubuntu 20.10 were updated to always use CGroupsV2 with crun. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Disable pod stats tests in containerized Fedora w/ CGroupsV1Chris Evich2020-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | Nearly/all of the 'podman stats' tests fail on Fedora when executing testing inside a container, and CGroupsV1 is used on the host. The typical failure message is of the form `Error: unable to load cgroup at /machine.slice/.../: cgroup deleted`. Note: Recently updated F32 (prior-fedora) and Ubuntu 20.04 (prior-ubuntu) VMs always use CGroupsV1 with runc. F33 and Ubuntu 20.10 were updated to always use CGroupsV2 with crun. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Disable blkio.weight test on UbuntuChris Evich2020-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests fail with `Error: opening file `io.bfq.weight` for writing: Permission denied: OCI permission denied`. Upon examination of the VMs, it was found the kernel and OS lacks support for the `BFQ` scheduler (which supplies the `weight` option). The only available schedulers are `none` and `mq-deadline`. Note: Recently updated F32 (prior-fedora) and Ubuntu 20.04 (prior-ubuntu) VMs always use CGroupsV1 with runc. F33 and Ubuntu 20.10 were updated to always use CGroupsV2 with crun. Signed-off-by: Chris Evich <cevich@redhat.com>
| * Cirrus: Add support for Ubuntu 20.xChris Evich2020-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously automation always dropped the minor version number for distributions. This was intended for presentation and conditional simplicity. Bash does not support non-integer comparison natively. With the release of version 20.10, supporting testing with it and the LTS release (20.04) requires scripts to consider minor version numbers for Ubuntu VMs. This is necessary because many times in the past, some behaviors needed to be conditional on the release version number. With this commit, the images and embedded scripts/tooling uses an altered format of `$UBUNTU_NAME', `$PRIOR_UBUNTU_NAME`, and (crucially) `$OS_RELEASE_VER` and `$OS_REL_VER`. Any `.` characters appearing in the official version (from `/etc/os-release`) are dropped, and the result is concatenated. For example the current Ubuntu LTS version is `20.04`. Prior to this commit, `$OS_RELEASE_VER` would have been `20`. With this change, `$OS_RELEASE_VER` will now show `2004`. Similarly `20.10` is shown as `2010`. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #8715 from baude/bindings3imagesOpenShift Merge Robot2020-12-16
|\ \ | | | | | | Podman image bindings for 3.0
| * | Podman image bindings for 3.0baude2020-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Begin the migration of the image bindings for podman 3.0. this includes the use of options for each binding. build was intentionally not converted as I believe it needs more discussion before migration. specifically, the build options themselves. also noteworthly is that the remove image and remove images bindings were merged into one. the remove images (or batch remove) has one downside in that the errors return no longer adhere to http return codes. this should be discussed and reimplemented in subsequent code. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #8730 from rhatdan/logOpenShift Merge Robot2020-12-16
|\ \ \ | | | | | | | | Add LogSize to container inspect
| * | | Add LogSize to container inspectDaniel J Walsh2020-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Other log options are available so we need to add ability to look up LogSize. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #8720 from edsantiago/batsOpenShift Merge Robot2020-12-16
|\ \ \ \ | |_|_|/ |/| | | system tests: the catch-up game
| * | | system tests: the catch-up gameEd Santiago2020-12-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - run test: minor cleanup to .containerenv test. Basically, make it do only two podman-runs (they're expensive) and tighten up the results checks - ps test: add ps -a --storage. Requires small tweak to run_podman helper, so we can have "timeout" be an expected result - sdnotify test: workaround for #8718 (seeing MAINPID=xxx as last output line instead of READY=1). As found by the newly-added debugging echos, what we are seeing is: MAINPID=103530 READY=1 MAINPID=103530 It's not supposed to be that way; it's supposed to be just the first two. But when faced with reality, we must bend to accommodate it, so let's accept READY=1 anywhere in the output stream, not just as the last line. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #8723 from matejvasek/cleanup-tmp-fileOpenShift Merge Robot2020-12-15
|\ \ \ \ | |_|/ / |/| | | Clean up temporary file.
| * | | Clean up temporary file.Matej Vasek2020-12-15
| |/ / | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | | Merge pull request #8726 from giuseppe/conmon-rootless-errs-to-infoOpenShift Merge Robot2020-12-15
|\ \ \ | | | | | | | | libpod, conmon: change log level for rootless
| * | | contrib: drop mirror.chpc.utah.edu:443Giuseppe Scrivano2020-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unused mirror from list of required host/ports: the host is unreachable due to DNS misconfiguration, and it doesn't look like we need it for anything anyway. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | libpod, conmon: change log level for rootlessGiuseppe Scrivano2020-12-15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Change the log level when running as rootless when moving conmon to a different cgroup. Closes: https://github.com/containers/podman/issues/8721 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #8725 from rhatdan/TMPDIROpenShift Merge Robot2020-12-15
|\ \ \ | |/ / |/| | Allow users to specify TMPDIR in containers.conf
| * | Allow users to specify TMPDIR in containers.confDaniel J Walsh2020-12-15
|/ / | | | | | | | | | | | | | | | | | | | | Currently we hard code TMPDIR environment variable to /var/tmp if it is not set in the Environment. This causes TMPDIR environment variable to be ignored if set in containers.conf. This change now uses the host environment TMPDIR, followed by containers.conf and then hard codes TMPDIR, if it was not set. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-29 23:22:15 +0000