Commit Graph

2297 Commits

Author SHA1 Message Date
Daniel J Walsh 897521e8d7 Merge pull request #1166 from containers/dependabot/go_modules/github.com/opencontainers/selinux-1.10.2
build(deps): bump github.com/opencontainers/selinux from 1.10.1 to 1.10.2
2022-09-29 06:00:24 -04:00
Aditya R aa2831dc24 util, GetRuntimeDir: don't error out early if XDG_RUNTIME_DIR is not found
We must try out all possible alternatives for rootless users instead of
failing eary if XDG_RUNTIME_DIR is not set.

Following regression was part of: 5948e6b369

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
2022-09-29 14:08:16 +05:30
dependabot[bot] 16fa932900 build(deps): bump github.com/opencontainers/selinux
Bumps [github.com/opencontainers/selinux](https://github.com/opencontainers/selinux) from 1.10.1 to 1.10.2.
- [Release notes](https://github.com/opencontainers/selinux/releases)
- [Commits](https://github.com/opencontainers/selinux/compare/v1.10.1...v1.10.2)

---
updated-dependencies:
- dependency-name: github.com/opencontainers/selinux
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-29 04:06:31 +00:00
Daniel J Walsh 4c7ae632c9 Merge pull request #1164 from flouthoc/normalize-platform-first
libimage.NormalizePlatform: normalize default `variant` as per specified `arch`
2022-09-28 14:51:19 -04:00
Aditya R 0f0e8ef3bc libimage.NormalizePlatform: normalize default variant as per specified arch
As of now NormalizePlatform ignores normalizing or setting default
variants for specific arch types thus producing empty variants in
results even when default variants were expected for such cases.

Example consider: `linux/armhf` -> `{os:linux, arch: arm, variant: v7}`

Signed-off-by: Aditya R <arajan@redhat.com>
2022-09-28 20:48:50 +05:30
OpenShift Merge Robot 13850996f1 Merge pull request #1162 from rhatdan/XDG_RUNTIME_DIR
Eval symlinks on XDG_RUNTIME_DIR
2022-09-26 22:39:45 +02:00
OpenShift Merge Robot 041ba86d48 Merge pull request #1136 from cdoern/ssh
add proper handling for golang ssh
2022-09-26 21:58:39 +02:00
Charlie Doern 2b86bc5d8a podman machine and podman-remote need some softer handling when it comes to key verification
this ensures that podman machine will still work (until we want to make this mandatory). I made the call back function more verbose so we know what is happening from now on.

Signed-off-by: Charlie Doern <cdoern@redhat.com>
2022-09-26 15:36:00 -04:00
Daniel J Walsh 5948e6b369 Eval symlinks on XDG_RUNTIME_DIR
Partial Fix for containers#14606

[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-09-23 14:06:26 -04:00
OpenShift Merge Robot 488f17fbf1 Merge pull request #1160 from vrothberg/fix-podman-15853
libimage: platform: check if image is corrupted
2022-09-21 10:31:34 +02:00
OpenShift Merge Robot 401fe1bb8e Merge pull request #1161 from giuseppe/fix-regression
config: correct the check for root
2022-09-20 22:52:55 +02:00
Giuseppe Scrivano 18803495e8 config: correct the check for root
originally the code had the condition "!unshare.IsRootless()", and
commit 50eb74a4b1 introduced the issue
by replacing it with "unshare.GetRootlessUID() != 0".

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-09-20 17:14:48 +02:00
Valentin Rothberg 5be7c13a41 libimage: platform: check if image is corrupted
When checking the platform of an image, take into account that it may be
corrupted.

Partially-fixes: containers/podman/issues/15853
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-09-20 13:00:20 +02:00
OpenShift Merge Robot 6173ac746f Merge pull request #1159 from containers/dependabot/go_modules/github.com/coreos/go-systemd/v22-22.4.0
build(deps): bump github.com/coreos/go-systemd/v22 from 22.3.2 to 22.4.0
2022-09-19 12:27:25 +02:00
OpenShift Merge Robot f997d7fcd3 Merge pull request #1158 from containers/dependabot/go_modules/github.com/onsi/ginkgo/v2-2.2.0
build(deps): bump github.com/onsi/ginkgo/v2 from 2.1.6 to 2.2.0
2022-09-19 12:24:50 +02:00
dependabot[bot] 7078600720 build(deps): bump github.com/coreos/go-systemd/v22 from 22.3.2 to 22.4.0
Bumps [github.com/coreos/go-systemd/v22](https://github.com/coreos/go-systemd) from 22.3.2 to 22.4.0.
- [Release notes](https://github.com/coreos/go-systemd/releases)
- [Commits](https://github.com/coreos/go-systemd/compare/v22.3.2...v22.4.0)

---
updated-dependencies:
- dependency-name: github.com/coreos/go-systemd/v22
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 04:15:21 +00:00
dependabot[bot] 0763f276a5 build(deps): bump github.com/onsi/ginkgo/v2 from 2.1.6 to 2.2.0
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.1.6 to 2.2.0.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/ginkgo/compare/v2.1.6...v2.2.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 04:15:16 +00:00
OpenShift Merge Robot 5b5dc24ac6 Merge pull request #1157 from giuseppe/look-uid-instead-of-rootless
config: look user id instead of rootless
2022-09-16 19:16:00 +02:00
Giuseppe Scrivano 50eb74a4b1 config: look user id instead of rootless
Change the check to look for the UID to decide whether to load the
default configuration files from the user directory instead of the
system path.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-09-16 16:46:09 +02:00
OpenShift Merge Robot a333879248 Merge pull request #1156 from Luap99/swagger
libnetwork/types: add correct swagger types
2022-09-14 15:38:33 +02:00
Paul Holzinger dca0b52b53 libnetwork/types: add correct swagger types
Both MAC and IP addresses are strings when serialized to JSON or
deserialized from JSON. By default swagger will show a byte array which
is wrong so we have to manually overwrite these fields.

Required for https://github.com/containers/podman/issues/13342
However we still have to update our swagger version to at least 0.30 in
podman to make it work.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-09-14 12:47:59 +02:00
OpenShift Merge Robot 7b8e1b19b2 Merge pull request #1154 from vrothberg/fix-events
libimage: remove: fix event
2022-09-13 16:58:21 +02:00
Valentin Rothberg ab0f9d93a2 libimage: remove: fix event
Wrap in a `nil` check to make sure that consumers not using events are
not bothered with log messages.  It's probably worth moving the check
into the function but I do not want start Yak shaving in a quick fix.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-09-13 15:59:26 +02:00
OpenShift Merge Robot daa0d2b81e Merge pull request #1153 from containers/dependabot/go_modules/github.com/docker/docker-20.10.18incompatible
build(deps): bump github.com/docker/docker from 20.10.17+incompatible to 20.10.18+incompatible
2022-09-12 14:02:38 +02:00
dependabot[bot] 676f36e137 build(deps): bump github.com/docker/docker
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.17+incompatible to 20.10.18+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/docker/docker/compare/v20.10.17...v20.10.18)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-12 04:08:45 +00:00
OpenShift Merge Robot 26ec6002bb Merge pull request #1150 from ashley-cui/secretsapi
Use StoreOpts for secret store API
2022-09-09 21:08:43 +02:00
Ashley Cui 0c92aa20b2 Use StoreOpts for secret store API
Clean up store code by using StoreOpts instead of multiple args as opts
for storing secrets.

Signed-off-by: Ashley Cui <acui@redhat.com>
2022-09-09 11:15:41 -04:00
OpenShift Merge Robot fb273649f8 Merge pull request #1151 from Luap99/events-log
phg/config: do not force default EventsLogFilePath
2022-09-09 16:07:35 +02:00
Paul Holzinger 7fff18ce94 phg/config: do not force default EventsLogFilePath
The problem with setting such defaults in c/common is that podman cannot
know if a user set this or it is the default. EventsLogFilePath is not a
static path, it depends on the --tmpdir value from podman.

check
b0b36430b8/libpod/runtime.go (L1041-L1043)

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-09-09 15:07:58 +02:00
OpenShift Merge Robot fbe0ebce86 Merge pull request #1148 from rhatdan/netavark
Ignore additionalstore images when deciding to use netavark or CNI
2022-09-08 20:19:09 +02:00
Daniel J Walsh f8f4db6239 Ignore additionalstore images when deciding to use netavark or CNI
We are using CNI for systems that have run podman system reset, if
storage is setup with additional stores.  This change will ignore
additional store images and will use netarvark on clean systems.

[NO NEW TESTS NEEDED]

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2124887

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-09-08 13:29:42 -04:00
OpenShift Merge Robot 2cd70642ef Merge pull request #1147 from ashley-cui/label
Add labels to secrets
2022-09-08 16:36:06 +02:00
OpenShift Merge Robot b428bae9c2 Merge pull request #1149 from rhatdan/VENDOR
Update vendor of containers/(storage,image)
2022-09-08 09:45:53 +02:00
Daniel J Walsh 29fbfd27e6 Update vendor of containers/(storage,image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-09-07 16:20:27 -04:00
Ashley Cui 104bc604d4 Add labels to secrets
Allow secrets to be labeled. Add new field in secrets package called
label.

Signed-off-by: Ashley Cui <acui@redhat.com>
2022-09-07 14:48:44 -04:00
OpenShift Merge Robot d3b2fd18be Merge pull request #1146 from Luap99/template
pkg/report: handle newline in template string
2022-09-06 15:29:13 +02:00
Paul Holzinger 12e4bd7fdb pkg/report: handle newline in template string
Docker tries to be smart and replaces \n with the actual newline character.
For compat we do the same but this will break formats such as '{{printf "\n"}}'
To be backwards compatible with the previous behavior we try to replace and
parse the template. If it fails use the original text and parse again.

This fix will not be enough. It requires many changes in podman since
most commands will do their own NormalizeFormat() call before using this
backend which seems wrong and creates a lot of duplication. This has to
be fixed in Podman.

Required for https://bugzilla.redhat.com/show_bug.cgi?id=2059658
and https://github.com/containers/podman/issues/13446.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-09-06 13:24:29 +02:00
OpenShift Merge Robot c5ee3ab4bc Merge pull request #1144 from containers/dependabot/go_modules/github.com/docker/go-units-0.5.0
build(deps): bump github.com/docker/go-units from 0.4.0 to 0.5.0
2022-09-02 13:31:18 +02:00
OpenShift Merge Robot ec616eccca Merge pull request #1143 from containers/dependabot/go_modules/github.com/onsi/gomega-1.20.2
build(deps): bump github.com/onsi/gomega from 1.20.1 to 1.20.2
2022-09-02 13:28:41 +02:00
OpenShift Merge Robot d5cae2ac03 Merge pull request #1135 from giuseppe/cpuset-missing-no-error
cgroup: do not fail with missing cpuset file
2022-09-02 13:26:09 +02:00
OpenShift Merge Robot 9e071d68bd Merge pull request #1133 from vrothberg/fix-996
docs: containers.conf: list all log drivers
2022-09-01 15:17:38 +02:00
dependabot[bot] b929fe6c9d build(deps): bump github.com/docker/go-units from 0.4.0 to 0.5.0
Bumps [github.com/docker/go-units](https://github.com/docker/go-units) from 0.4.0 to 0.5.0.
- [Release notes](https://github.com/docker/go-units/releases)
- [Commits](https://github.com/docker/go-units/compare/v0.4.0...v0.5.0)

---
updated-dependencies:
- dependency-name: github.com/docker/go-units
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-01 04:11:40 +00:00
dependabot[bot] 63a6d20ee8 build(deps): bump github.com/onsi/gomega from 1.20.1 to 1.20.2
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.20.1 to 1.20.2.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.20.1...v1.20.2)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-01 04:11:30 +00:00
OpenShift Merge Robot b41b466a69 Merge pull request #1141 from containers/dependabot/go_modules/github.com/onsi/ginkgo/v2-2.1.6
build(deps): bump github.com/onsi/ginkgo/v2 from 2.1.4 to 2.1.6
2022-08-31 08:52:05 -04:00
dependabot[bot] a9bf9ca8cc build(deps): bump github.com/onsi/ginkgo/v2 from 2.1.4 to 2.1.6
Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.1.4 to 2.1.6.
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/ginkgo/compare/v2.1.4...v2.1.6)

---
updated-dependencies:
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-31 04:12:00 +00:00
Giuseppe Scrivano 06204cbe5e cgroup: do not fail with missing cpuset file
if cpuset.cpus[.effective] file is missing, then ignore the error
since it means the cpuset controller is not enabled in the kernel,
rather than returning an error.

Closes: https://github.com/containers/common/issues/1134

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-08-30 10:45:27 +02:00
OpenShift Merge Robot 543eaf777c Merge pull request #1139 from containers/dependabot/go_modules/github.com/onsi/gomega-1.20.1
build(deps): bump github.com/onsi/gomega from 1.20.0 to 1.20.1
2022-08-29 06:33:00 -04:00
OpenShift Merge Robot 278ea68e45 Merge pull request #1137 from dfr/freebsd-config
Change default cgroups mode to enabled on FreeBSD
2022-08-29 06:30:32 -04:00
OpenShift Merge Robot 71dc590dc5 Merge pull request #1138 from rhatdan/stutters
Fix stutters
2022-08-29 03:23:29 -04:00
dependabot[bot] 77cc132b88 build(deps): bump github.com/onsi/gomega from 1.20.0 to 1.20.1
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.20.0 to 1.20.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](https://github.com/onsi/gomega/compare/v1.20.0...v1.20.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-29 04:07:06 +00:00