summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* use libnetwork from c/commonPaul Holzinger2022-01-12
| | | | | | | | The libpod/network packages were moved to c/common so that buildah can use it as well. To prevent duplication use it in podman as well and remove it from here. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* Merge pull request #12824 from ↵OpenShift Merge Robot2022-01-12
|\ | | | | | | | | containers/dependabot/go_modules/github.com/BurntSushi/toml-1.0.0 Bump github.com/BurntSushi/toml from 0.4.1 to 1.0.0
| * Bump github.com/BurntSushi/toml from 0.4.1 to 1.0.0dependabot[bot]2022-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/BurntSushi/toml](https://github.com/BurntSushi/toml) from 0.4.1 to 1.0.0. - [Release notes](https://github.com/BurntSushi/toml/releases) - [Commits](https://github.com/BurntSushi/toml/compare/v0.4.1...v1.0.0) --- updated-dependencies: - dependency-name: github.com/BurntSushi/toml dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #12821 from vrothberg/vendor-commonOpenShift Merge Robot2022-01-12
|\ \ | |/ |/| vendor latest c/common
| * vendor latest c/commonValentin Rothberg2022-01-12
| | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #12819 from rhatdan/machineDaniel J Walsh2022-01-12
|\ \ | |/ |/| add additional fields to podman machine ls --json
| * add additional fields to podman machine ls --jsonDaniel J Walsh2022-01-11
| | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #12813 from rhatdan/secretsOpenShift Merge Robot2022-01-12
|\ \ | | | | | | Fix permission on secrets directory
| * | Fix permission on secrets directoryDaniel J Walsh2022-01-11
| |/ | | | | | | | | | | | | | | | | This directory needs to be world searchable so users can access it from different user namespaces. Fixes: https://github.com/containers/podman/issues/12779 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #12818 from edsantiago/emergency_buildah_skipsOpenShift Merge Robot2022-01-12
|\ \ | |/ |/| buildah bud tests: skip failing tests
| * buildah bud tests: skip failing testsEd Santiago2022-01-11
|/ | | | | | | | | | | | | | | Emergency workaround for github's deprecation of git:// https://github.blog/2021-09-01-improving-git-protocol-security-github/ Two buildah tests rely on 'git://' URLs. These now fail. They have been fixed in the buildah repo[1] but it will take time to vendor that in. ITM, we need to get CI passing. Skip those two failing tests. [1] https://github.com/containers/buildah/pull/3701 Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #12694 from rhatdan/dependDaniel J Walsh2022-01-11
|\ | | | | Add podman rm --depend
| * Add podman rm --dependDaniel J Walsh2022-01-11
|/ | | | | | | | | | | This option causes Podman to not only remove the specified containers but all of the containers that depend on the specified containers. Fixes: https://github.com/containers/podman/issues/10360 Also ran codespell on the code Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #12807 from Luap99/macvlan-hostipDaniel J Walsh2022-01-11
|\ | | | | fix host.containers.internal entry for macvlan networks
| * fix host.containers.internal entry for macvlan networksPaul Holzinger2022-01-11
| | | | | | | | | | | | | | | | | | | | | | | | For ip/macvlan networks we cannot use the gateway as address for this hostname. In this case the gateway is normally not on the host so we just try to use a local ip instead. [NO NEW TESTS NEEDED] We cannot run macvlan networks in CI. Fixes #11351 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | Merge pull request #12748 from flouthoc/ign_add_proxy_varsOpenShift Merge Robot2022-01-11
|\ \ | | | | | | ignition: set `HTTP` proxy variable and `SSL_CERT_FILE` from `host` -> `machine`.
| * | pkg: use PROXY_VARS from c/commonAditya Rajan2022-01-11
| | | | | | | | | | | | Signed-off-by: Aditya Rajan <arajan@redhat.com>
| * | ignition: add support from setting SSL_CERT_FILEAditya Rajan2022-01-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman often has to run behind an http/https proxy, often in corporate environments. This proxy may or may not include SSL inspection capabilities, requiring a trusted SSL CA certificate to be added to a system's trust store. Copy the file referred to by SSL_CERT_FILE on the host into the podman machine's OS trust store, overriding the built-in single-file trust store certificate. Also set the `SSL_FILE_CERT` on remote machine [NO NEW TESTS NEEDED] Signed-off-by: Aditya Rajan <arajan@redhat.com>
| * | ignition: propogate HTTP proxy variables from host to remoteAditya Rajan2022-01-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman often has to run behind an http/https proxy, often in corporate environments. This proxy may or may not include SSL inspection capabilities, requiring a trusted SSL CA certificate to be added to a system's trust store. Solve this by reading standard proxy variables (HTTP_PROXY HTTPS_PROXY NO_PROXY http_proxy https_proxy no_proxy) and injecting them into the machine at init. [NO NEW TESTS NEEDED] Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | Merge pull request #12806 from rhatdan/machine1Daniel J Walsh2022-01-11
|\ \ \ | | | | | | | | It takes some time to start a VM
| * | | It takes some time to start a VMDaniel J Walsh2022-01-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are seeing some issues with users not understanding which VM they are starting, and if the VM takes a long time to start, they do not know where to look. Moving the name to before the VM starts at least allows them to realize they are starting the wrong VM. [NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #12805 from rhatdan/machineDaniel J Walsh2022-01-11
|\ \ \ \ | |/ / / |/| | | Pretty Print output of podman machine ls --format json
| * | | Pretty Print output of podman machine ls --format jsonDaniel J Walsh2022-01-11
|/ / / | | | | | | | | | | | | | | | | | | | | | Make JSON more prominent in podman machine ls --help and man page. [NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #12780 from rhatdan/podOpenShift Merge Robot2022-01-11
|\ \ \ | | | | | | | | Use the InfraImage defined in containers.conf
| * | | Use the InfraImage defined in containers.confDaniel J Walsh2022-01-10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Remove hard code use of the DefaultInfraImage and rely on getting this from containers.conf. Fixes: https://github.com/containers/podman/issues/12771 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #12793 from cevich/vmimg_updateOpenShift Merge Robot2022-01-10
|\ \ \ | | | | | | | | Enable gitlab runner unit testing + Freshen VM images w/ crun-1.4-1
| * | | Cirrus: Freshen VM imagesChris Evich2022-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, this brings in `crun 1.4-1` allowing removal of a temporary workaround. Ref: https://github.com/containers/podman/pull/12759 Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | Revert "Cirrus: Temp. ignore gitlab task failures"Chris Evich2022-01-10
| |/ / | | | | | | | | | | | | | | | | | | | | | Ref: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/28766 This reverts commit 8cb93ac1035b8966b03a87ea58366fe9f3fc7887. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #12792 from mheon/bump_400_rc1OpenShift Merge Robot2022-01-10
|\ \ \ | | | | | | | | Bump to v4.0.0-RC1
| * | | Bump to v4.0.0-devMatthew Heon2022-01-10
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | Bump to v4.0.0-RC1v4.0.0-rc1Matthew Heon2022-01-10
| |/ / | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #12791 from edsantiago/batsOpenShift Merge Robot2022-01-10
|\ \ \ | |/ / |/| | System tests: fix RHEL8 gating tests
| * | System tests: fix RHEL8 gating testsEd Santiago2022-01-10
|/ / | | | | | | | | | | | | | | | | | | Add a fix for RHEL8 gating tests. This resolves yet another journald/file events/logger mismatch bug. Also, while I'm at it, more log cleanup: a recently-added test was missing final rm/rmi, resulting in big red scary output in test logs. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #12772 from rhatdan/pauseOpenShift Merge Robot2022-01-10
|\ \ | | | | | | Remove dead RuntimeOption functions
| * | Remove dead RuntimeOption functionsDaniel J Walsh2022-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't see where these With Functions are used, so removing them to clean up code. WithDefaultInfra* functions screwed me up and confused me. [NO NEW TESTS NEEDED] Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #12757 from umohnani8/cmOpenShift Merge Robot2022-01-10
|\ \ \ | | | | | | | | Don't add env if optional and not found
| * | | Don't add env if optional and not foundUrvashi Mohnani2022-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the pod yaml has env from secret and condifg map but they are optional and the secret cannot be found, don't add the env key as well as the env value will not be found. Matches behavior with k8s. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | Merge pull request #12786 from vrothberg/vendor-commonOpenShift Merge Robot2022-01-10
|\ \ \ \ | | | | | | | | | | vendor c/common
| * | | | vendor c/commonValentin Rothberg2022-01-10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the e2e pull test to account for the changes when pulling from the dir transport. Images pulled via the dir transport are not tagged anymore; the path is not a reliable source. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #12787 from rhatdan/dockerOpenShift Merge Robot2022-01-10
|\ \ \ \ | |_|/ / |/| | | Update docker cli message for case where user creates directory
| * | | Update docker cli message for case where user creates directoryStephen Person2022-01-10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Check for any existing system object in docker script to clear warning message (Resolving PR comments) [NO NEW TESTS NEEDED] Signed-off-by: Stephen Person <stephen.person.12@cnu.edu> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #12783 from n1hility/wxs-fixOpenShift Merge Robot2022-01-10
|\ \ \ | |/ / |/| | [NO TESTS NEEDED] Fix type-o in podman.wxs
| * | Fix type-o in podman.wxsJason T. Greene2022-01-09
|/ / | | | | | | Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | Merge pull request #12773 from mhrivnak/fix-example-indentationOpenShift Merge Robot2022-01-08
|\ \ | | | | | | [CI:DOCS] fixes indentation of example pod yaml
| * | [CI:DOCS] fixes indentation of example pod yamlMichael Hrivnak2022-01-07
|/ / | | | | | | | | | | | | | | | | The example as previously shown would result in "Error: multi doc yaml could not be split". The change here has been tested to work, and it matches the example in the [kubernetes docs](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/#configure-all-key-value-pairs-in-a-configmap-as-container-environment-variables). Signed-off-by: Michael Hrivnak <mhrivnak@hrivnak.org>
* | Merge pull request #12733 from rhatdan/copyOpenShift Merge Robot2022-01-07
|\ \ | |/ |/| Set volume NeedsCopyUp to false iff data was copied up
| * Set volume NeedsCopyUp to false iff data was copied upDaniel J Walsh2022-01-06
| | | | | | | | | | | | | | | | | | | | | | | | Currently Docker copies up the first volume on a mountpoint with data. Fixes: https://github.com/containers/podman/issues/12714 Also added NeedsCopyUP, NeedsChown and MountCount to the podman volume inspect code. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #12767 from riyad/fix-storage-opt-double-decodeOpenShift Merge Robot2022-01-07
|\ \ | | | | | | Prevent double decoding of storage options
| * | Prevent double decoding of storage optionsRiyad Preukschas2022-01-07
| | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] see #11991 Signed-off-by: Riyad Preukschas <riyad@informatik.uni-bremen.de>
* | | Merge pull request #12764 from edsantiago/batsOpenShift Merge Robot2022-01-07
|\ \ \ | | | | | | | | Emergency system-test fixes
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-26 18:55:26 +0000