Commit Graph

10 Commits

Author SHA1 Message Date
Ashley Cui a61dce37d7 Prioritize addtionalHelperBinariesDir over default dirs
When addtionalHelperBinariesDir is set, first search that path for helper binaries, then the default locations.

Signed-off-by: Ashley Cui <acui@redhat.com>
2023-11-29 09:11:12 -05:00
Doug Rabson 478419732a Change default image volume mode to "nullfs" on FreeBSD
This fixes a regression in
https://github.com/containers/podman/pull/19241 which quite reasonably
assumed that the default image volume mode from pkg/config was correct.

Signed-off-by: Doug Rabson <dfr@rabson.org>
2023-07-17 14:58:23 +01:00
Valentin Rothberg e959f47d3a mac helper binaries: add default brew libexec path
After installing podman via brew, I expected a locally compiled one to
work as well.  But it failed as it could not find gvproxy.  It turns out
that brew installs it at /opt/homebrew/opt/podman/libexec/podman/gvproxy,
so I want the directory to be part of the default look-up paths.

Same applies to the `/usr/local/opt` paths used on Intel Macs.  Also
rearrange the order a bit.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2023-06-27 11:00:40 +02:00
Doug Rabson 4b906d8159 pkg/config: Fix DefaultSignaturePath on FreeBSD
The correct location on FreeBSD is /usr/local/etc/containers/policy.json
which is consistent with path conventions for installed packages. This
fixes 'podman commit' on FreeBSD.

There are several definitions of this path:

- c/image/signature has builtinDefaultPolicyPath and DefaultPolicy
- c/podman/pkg/trust has systemDefaultPolicyPath and DefaultPolicyPath
- c/common/pkg/config has DefaultSignaturePolicyPath

As far as I can tell, buildah uses c/image/signature which is why 'buildah
commit' was already working for me. Podman is using the c/common one. Very
confusing.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-11-09 16:50:45 +00:00
Filipe Brandenburger bd82c36998 config: Update Darwin config to include a directory relative to $BINDIR
Look for helpers such as `gvproxy` under `$BINDIR/../libexec/podman`, which
helps this work on distributions such as Homebrew without the need to hardcode
paths into the binary, which makes a pre-built binary distribution work
regardless of the installation prefix.

Tested: Updated vendored package in podman, built it with `podman-remote`,
copied `gvproxy` to a `libexec/podman` at the same level as `bin/podman` and
confirmed that `podman machine start` worked as expected.

Signed-off-by: Filipe Brandenburger <filbranden@gmail.com>
2022-08-22 13:28:00 -07:00
Doug Rabson a4a658034b Config files should live in /usr/local on FreeBSD
Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-05-09 14:07:58 +01:00
Paul Holzinger 25622da26e Add HelperBinariesDir field to engine config
This field contains a list of directories which should be used to store
some helper binaries, e.g. gvproxy.

Also add a FindHelperBinary method to the config struct to get the full
path to a helper binary.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2021-09-10 13:38:19 +02:00
Ashley Cui e237d2da9b Fix reading configs on mac and windows
On Mac and Windows, automtically read default rootless config location, since
unshare.IsRootless doesn't work.

Signed-off-by: Ashley Cui <acui@redhat.com>
2021-05-10 15:27:01 -04:00
Daniel J Walsh d208f7340c Update pkg/config/config_darwin.go
Co-authored-by: Jhon Honce <jhonce@redhat.com>
2020-08-22 09:11:12 -04:00
Brent Baude 054d133710 getCustomConfigFile for windows and darwin
podman remote clients that run on windows and darwin cannot use the isRootless to determine the configuration file locations.  here we do by OS and also honor the environment variable.

Signed-off-by: Brent Baude <bbaude@redhat.com>
2020-08-22 09:11:12 -04:00