Commit Graph

1865 Commits

Author SHA1 Message Date
Daniel J Walsh a28c005eb2 Vendor in latest containers/(storage,image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-06-13 22:10:32 -04:00
OpenShift Merge Robot 3ba1ccdac4 Merge pull request #1477 from rhatdan/pull
When using additional stores, report id only once
2023-06-13 13:34:41 -04:00
OpenShift Merge Robot 17621c2341 Merge pull request #1500 from fengxsong/quick_fix
fix: add a local variable 'isRetryable' to avoid modifying the caller's Options
2023-06-13 11:59:25 -04:00
renovate[bot] ffb8f6ea73 fix(deps): update module golang.org/x/crypto to v0.10.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-13 14:58:44 +00:00
fengxsong 1f26fa7a66 fix: add a local variable 'isRetryable' to avoid modifying the caller's Options'
Signed-off-by: fengxsong <fengxsong@outlook.com>
2023-06-13 09:29:22 +08:00
renovate[bot] 5b0d86dc2e fix(deps): update module golang.org/x/term to v0.9.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-12 19:20:49 +00:00
renovate[bot] 5ef30093cf fix(deps): update module golang.org/x/sys to v0.9.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-12 18:58:33 +00:00
renovate[bot] 949f247a44 fix(deps): update module github.com/opencontainers/runtime-spec to v1.1.0-rc.3
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-12 18:00:23 +00:00
OpenShift Merge Robot f07f635978 Merge pull request #1497 from Luap99/net-id
libnetwork: handle id filter better
2023-06-12 13:59:00 -04:00
Daniel J Walsh 252b3036f5 When using additional stores, report id only once
Currently if you setup additional stores and pull the same
image that exists in additionalstore, podman ends up reporting
the ID twice.

Fixes: https://github.com/containers/podman/issues/18647

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-06-12 13:58:44 -04:00
Paul Holzinger f28b52d2ee libnetwork: handle id filter better
By default we should do a standard prefix match.
See https://github.com/containers/podman/issues/18471 for context.

Also use the c/storage regex package to only compile the regex when
needed.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-12 17:00:40 +02:00
Doug Rabson 5daab4a8cf pkg/config: override DefaultInitPath for FreeBSD
FreeBSD packages typically install files under /usr/local on FreeBSD.

Signed-off-by: Doug Rabson <dfr@rabson.org>
2023-06-12 16:00:37 +01:00
Doug Rabson d68f132c74 pkg/config: fix unit tests for FreeBSD
This just disables the capabilities test - everything else already
passed.

Signed-off-by: Doug Rabson <dfr@rabson.org>
2023-06-12 15:11:50 +01:00
OpenShift Merge Robot dd7d654158 Merge pull request #1492 from fengxsong/retry_options
feat: add a function to determine whether a retry is necessary when error occured
2023-06-12 08:29:51 -04:00
fengxsong 0606e62c97 fix: add a function to determine weather a retry is necessary when error occured and make function 'IsErrorRetryable' public
Signed-off-by: fengxsong <fengxsong@outlook.com>
2023-06-11 09:23:08 +08:00
renovate[bot] 2684d29a9d fix(deps): update module github.com/burntsushi/toml to v1.3.2
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-08 14:36:31 +00:00
renovate[bot] 8ad972adbb fix(deps): update module github.com/onsi/gomega to v1.27.8
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-07 08:21:10 +00:00
renovate[bot] 082a90f3ae fix(deps): update module github.com/onsi/ginkgo/v2 to v2.10.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-07 08:01:30 +00:00
renovate[bot] 75339a4552 fix(deps): update module github.com/burntsushi/toml to v1.3.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-06 12:39:07 +00:00
OpenShift Merge Robot d181ed1d03 Merge pull request #1480 from rhatdan/man
[CI:DOCS] Document disabling detach-keys
2023-06-06 04:30:22 -04:00
renovate[bot] 3776fc8358 fix(deps): update github.com/containers/storage digest to 1dc289a
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-05 18:41:11 +00:00
Daniel J Walsh 093643a7a4 Document disabling detach-keys
https://github.com/containers/podman/issues/18708 points out that user
did not understand how to disable detach-keys in containers.conf.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-06-05 14:37:04 -04:00
renovate[bot] a227b925ab fix(deps): update github.com/containers/image/v5 digest to abe5133
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-05 13:58:05 +00:00
renovate[bot] 0fc5aa6fd0 fix(deps): update module github.com/containerd/containerd to v1.7.2
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-05 09:42:08 +00:00
renovate[bot] 100ffd4b57 chore(deps): update dependency containers/automation_images to v20230601
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-05 09:20:55 +00:00
renovate[bot] 69ef124820 fix(deps): update module github.com/sirupsen/logrus to v1.9.3
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-03 21:55:37 +00:00
OpenShift Merge Robot 06aa73fa82 Merge pull request #1481 from rhatdan/config
Add some fixes for CompressionFormat
2023-06-01 04:50:31 -04:00
renovate[bot] 8a22d8c656 fix(deps): update module github.com/onsi/ginkgo/v2 to v2.9.7
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-31 05:06:49 +00:00
Daniel J Walsh a370cfad72 Add some fixes for CompressionFormat
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-05-30 17:32:27 -04:00
renovate[bot] 1496ed607c fix(deps): update module github.com/stretchr/testify to v1.8.4
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-30 16:41:48 +00:00
renovate[bot] d7af8c1a93 fix(deps): update module github.com/burntsushi/toml to v1.3.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-30 16:24:22 +00:00
renovate[bot] e6ce9d6b73 fix(deps): update module github.com/docker/docker to v24.0.2+incompatible
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2023-05-26 09:24:55 +00:00
Paul Holzinger e9c74cfce1 netavark: add bclim option for macvlan
see https://github.com/containers/netavark/pull/698

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-05-25 10:28:38 +02:00
OpenShift Merge Robot a30cf2ef44 Merge pull request #1440 from Cydox/static-routes-pull
Static Routes
2023-05-24 15:44:00 -04:00
Jan Hendrik Farr 97e2561e60 add static routes
Signed-off-by: Jan Hendrik Farr <github@jfarr.cc>
2023-05-24 10:11:08 +00:00
OpenShift Merge Robot 0531595169 Merge pull request #1464 from Luap99/pasta-config
pkg/config: new fields for better pasta integration
2023-05-23 10:47:35 -04:00
Paul Holzinger c0a7616486 pkg/config: add default_rootless_network_cmd field
Add a new field to the network section to allow users to set the default
network program which is used when running rootless containers.
This should be used when you run something like --network private or
--network default as rootless user.

The current default is slirp4netns so we keep that for now. Once I
integrate pasta in the rootless netns then we can consider switching the
default to pasta.

This setting will also be useful then for distros who may not ship pasta
so that they could set it back to slirp if needed.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-05-23 13:40:23 +02:00
Paul Holzinger 2b8784dad0 pkg/config: add pasta_options field
Users way wish to configure a set of default options that should be used
when running pasta. Options that are given on the cli will be appended,
however the implementation of this needs to happen in podman.

For slirp4netns we already support the network_cmd_options field.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-05-23 13:40:22 +02:00
renovate[bot] de262ab6bc fix(deps): update module github.com/sirupsen/logrus to v1.9.2
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2023-05-22 10:08:21 +00:00
renovate[bot] 02f6fc9b22 fix(deps): update module github.com/stretchr/testify to v1.8.3
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2023-05-20 10:04:04 +00:00
renovate[bot] 11381f3604 fix(deps): update module github.com/docker/docker to v24.0.1+incompatible
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2023-05-20 00:24:41 +00:00
renovate[bot] 23c2705a8f fix(deps): update module github.com/onsi/gomega to v1.27.7
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2023-05-18 18:12:48 +00:00
renovate[bot] 4715f6cecb chore(deps): update dependency containers/automation_images to v20230517
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2023-05-17 17:50:31 +00:00
Daniel J Walsh 48ee02d7ae Merge pull request #1468 from containers/renovate/github.com-docker-docker-24.x
fix(deps): update module github.com/docker/docker to v24
2023-05-16 17:41:04 -04:00
OpenShift Merge Robot 156b861b0f Merge pull request #1467 from sstosh/fix-indentation
Fix indentation for the containers.conf
2023-05-16 17:40:09 -04:00
OpenShift Merge Robot 3d5bfd2e17 Merge pull request #1460 from sstosh/networkinfo
libnetwork: add NetworkInfo() for get network information
2023-05-16 16:56:56 -04:00
renovate[bot] 056ccb04e4 fix(deps): update module github.com/docker/docker to v24
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2023-05-16 20:55:05 +00:00
Toshiki Sonoda 63945682ab Fix indentation for the containers.conf
Fix the indentation of netavark_plugin_dirs
in the containers.conf

Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
2023-05-16 16:51:32 +09:00
renovate[bot] f60c0b3278 fix(deps): update module golang.org/x/crypto to v0.9.0
Signed-off-by: Renovate Bot <bot@renovateapp.com>
2023-05-16 06:58:45 +00:00
Toshiki Sonoda 32716085ac libnetwork: add NetworkInfo() for get network information
NetworkInfo() return the network binary path, package version,
program version and DNS information.

Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
2023-05-16 14:20:45 +09:00