From 7bb09a923c1eb6d3ee1a4716cf2d848f4f3dbba0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Mar 2026 18:01:57 +0000 Subject: [PATCH 1/2] fix(deps): update module github.com/moby/moby/client to v0.3.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 4 +-- go.sum | 8 ++--- .../moby/moby/api/types/image/manifest.go | 5 +++ .../moby/api/types/jsonstream/json_error.go | 3 ++ .../moby/moby/api/types/swarm/network.go | 22 ++++++++++++ .../github.com/moby/moby/api/types/types.go | 36 ++++++++++++------- vendor/github.com/moby/moby/client/client.go | 9 ++--- .../moby/moby/client/container_logs.go | 18 +++++++++- .../github.com/moby/moby/client/image_list.go | 8 +++++ .../moby/moby/client/image_list_opts.go | 3 ++ .../moby/moby/client/internal/jsonmessages.go | 16 +++++---- vendor/github.com/moby/moby/client/request.go | 21 ++++++----- .../moby/moby/client/service_logs.go | 17 ++++++++- .../moby/moby/client/system_events.go | 6 ++-- vendor/modules.txt | 4 +-- 15 files changed, 133 insertions(+), 47 deletions(-) diff --git a/go.mod b/go.mod index 12b62ac8d00..1b984902eb4 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/mattn/go-shellwords v1.0.12 github.com/moby/buildkit v0.26.3 - github.com/moby/moby/client v0.2.2 + github.com/moby/moby/client v0.3.0 github.com/moby/sys/capability v0.4.0 github.com/moby/sys/userns v0.1.0 github.com/opencontainers/cgroups v0.0.6 @@ -98,7 +98,7 @@ require ( github.com/mistifyio/go-zfs/v4 v4.0.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/moby/go-archive v0.1.0 // indirect - github.com/moby/moby/api v1.53.0 // indirect + github.com/moby/moby/api v1.54.0 // indirect github.com/moby/patternmatcher v0.6.0 // indirect github.com/moby/sys/mountinfo v0.7.2 // indirect github.com/moby/sys/sequential v0.6.0 // indirect diff --git a/go.sum b/go.sum index a5b672b5445..c104a31353a 100644 --- a/go.sum +++ b/go.sum @@ -162,10 +162,10 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ= github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo= -github.com/moby/moby/api v1.53.0 h1:PihqG1ncw4W+8mZs69jlwGXdaYBeb5brF6BL7mPIS/w= -github.com/moby/moby/api v1.53.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc= -github.com/moby/moby/client v0.2.2 h1:Pt4hRMCAIlyjL3cr8M5TrXCwKzguebPAc2do2ur7dEM= -github.com/moby/moby/client v0.2.2/go.mod h1:2EkIPVNCqR05CMIzL1mfA07t0HvVUUOl85pasRz/GmQ= +github.com/moby/moby/api v1.54.0 h1:7kbUgyiKcoBhm0UrWbdrMs7RX8dnwzURKVbZGy2GnL0= +github.com/moby/moby/api v1.54.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc= +github.com/moby/moby/client v0.3.0 h1:UUGL5okry+Aomj3WhGt9Aigl3ZOxZGqR7XPo+RLPlKs= +github.com/moby/moby/client v0.3.0/go.mod h1:HJgFbJRvogDQjbM8fqc1MCEm4mIAGMLjXbgwoZp6jCQ= github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk= github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/sys/capability v0.4.0 h1:4D4mI6KlNtWMCM1Z/K0i7RV1FkX+DBDHKVJpCndZoHk= diff --git a/vendor/github.com/moby/moby/api/types/image/manifest.go b/vendor/github.com/moby/moby/api/types/image/manifest.go index db8a00830e7..bcd00a07970 100644 --- a/vendor/github.com/moby/moby/api/types/image/manifest.go +++ b/vendor/github.com/moby/moby/api/types/image/manifest.go @@ -73,6 +73,11 @@ type ImageProperties struct { // Required: true Platform ocispec.Platform `json:"Platform"` + // Identity holds information about the identity and origin of the image. + // For image list responses, this can duplicate Build/Pull fields across + // image manifests, because those parts of identity are image-level metadata. + Identity *Identity `json:"Identity,omitempty"` + Size struct { // Unpacked is the size (in bytes) of the locally unpacked // (uncompressed) image content that's directly usable by the containers diff --git a/vendor/github.com/moby/moby/api/types/jsonstream/json_error.go b/vendor/github.com/moby/moby/api/types/jsonstream/json_error.go index 632b25fdf49..0dcc9337dba 100644 --- a/vendor/github.com/moby/moby/api/types/jsonstream/json_error.go +++ b/vendor/github.com/moby/moby/api/types/jsonstream/json_error.go @@ -8,5 +8,8 @@ type Error struct { } func (e *Error) Error() string { + if e == nil { + return "" + } return e.Message } diff --git a/vendor/github.com/moby/moby/api/types/swarm/network.go b/vendor/github.com/moby/moby/api/types/swarm/network.go index a70ac0690e2..b32c308f69e 100644 --- a/vendor/github.com/moby/moby/api/types/swarm/network.go +++ b/vendor/github.com/moby/moby/api/types/swarm/network.go @@ -1,6 +1,7 @@ package swarm import ( + "cmp" "net/netip" "github.com/moby/moby/api/types/network" @@ -41,6 +42,27 @@ type PortConfig struct { PublishMode PortConfigPublishMode `json:",omitempty"` } +// Compare returns the lexical ordering of p and other, and can be used +// with [slices.SortFunc]. +// +// The comparison is performed in the following priority order: +// 1. PublishedPort (host port) +// 2. TargetPort (container port) +// 3. Protocol +// 4. PublishMode +func (p PortConfig) Compare(other PortConfig) int { + if n := cmp.Compare(p.PublishedPort, other.PublishedPort); n != 0 { + return n + } + if n := cmp.Compare(p.TargetPort, other.TargetPort); n != 0 { + return n + } + if n := cmp.Compare(p.Protocol, other.Protocol); n != 0 { + return n + } + return cmp.Compare(p.PublishMode, other.PublishMode) +} + // PortConfigPublishMode represents the mode in which the port is to // be published. type PortConfigPublishMode string diff --git a/vendor/github.com/moby/moby/api/types/types.go b/vendor/github.com/moby/moby/api/types/types.go index bb5aa41a83a..5da64796e8d 100644 --- a/vendor/github.com/moby/moby/api/types/types.go +++ b/vendor/github.com/moby/moby/api/types/types.go @@ -1,21 +1,33 @@ package types +// MediaType represents an HTTP media type (MIME type) used in API +// Content-Type and Accept headers. +// +// In addition to standard media types (for example, "application/json"), +// this package defines vendor-specific vendor media types for streaming +// endpoints, such as raw TTY streams and multiplexed stdout/stderr streams. +type MediaType = string + const ( - // MediaTypeRawStream is vendor specific MIME-Type set for raw TTY streams. - MediaTypeRawStream = "application/vnd.docker.raw-stream" + // MediaTypeRawStream is a vendor-specific media type for raw TTY streams. + MediaTypeRawStream MediaType = "application/vnd.docker.raw-stream" - // MediaTypeMultiplexedStream is vendor specific MIME-Type set for stdin/stdout/stderr multiplexed streams. - MediaTypeMultiplexedStream = "application/vnd.docker.multiplexed-stream" + // MediaTypeMultiplexedStream is a vendor-specific media type for streams + // where stdin, stdout, and stderr are multiplexed into a single byte stream. + // + // Use stdcopy.StdCopy (https://pkg.go.dev/github.com/moby/moby/api/pkg/stdcopy) + // to demultiplex the stream. + MediaTypeMultiplexedStream MediaType = "application/vnd.docker.multiplexed-stream" - // MediaTypeJSON is the MIME-Type for JSON objects. - MediaTypeJSON = "application/json" + // MediaTypeJSON is the media type for JSON objects. + MediaTypeJSON MediaType = "application/json" - // MediaTypeNDJSON is the MIME-Type for Newline Delimited JSON objects streams (https://github.com/ndjson/ndjson-spec). - MediaTypeNDJSON = "application/x-ndjson" + // MediaTypeNDJSON is the media type for newline-delimited JSON streams (https://github.com/ndjson/ndjson-spec). + MediaTypeNDJSON MediaType = "application/x-ndjson" - // MediaTypeJSONLines is the MIME-Type for JSONLines objects streams (https://jsonlines.org/). - MediaTypeJSONLines = "application/jsonl" + // MediaTypeJSONLines is the media type for JSON Lines streams (https://jsonlines.org/). + MediaTypeJSONLines MediaType = "application/jsonl" - // MediaTypeJSONSequence is the MIME-Type for JSON Text Sequences (RFC7464). - MediaTypeJSONSequence = "application/json-seq" + // MediaTypeJSONSequence is the media type for JSON text sequences (RFC 7464). + MediaTypeJSONSequence MediaType = "application/json-seq" ) diff --git a/vendor/github.com/moby/moby/client/client.go b/vendor/github.com/moby/moby/client/client.go index d8e69953d52..2d1e0db79a8 100644 --- a/vendor/github.com/moby/moby/client/client.go +++ b/vendor/github.com/moby/moby/client/client.go @@ -107,11 +107,11 @@ const DummyHost = "api.moby.localhost" // overriding the version and disable API-version negotiation. // // This version may be lower than the version of the api library module used. -const MaxAPIVersion = "1.53" +const MaxAPIVersion = "1.54" // MinAPIVersion is the minimum API version supported by the client. API versions // below this version are not considered when performing API-version negotiation. -const MinAPIVersion = "1.44" +const MinAPIVersion = "1.40" // Ensure that Client always implements APIClient. var _ APIClient = &Client{} @@ -179,10 +179,7 @@ func NewClientWithOpts(ops ...Opt) (*Client, error) { // [WithAPIVersionFromEnv] to configure the client with a fixed API version // and disable API version negotiation. // -// cli, err := client.New( -// client.FromEnv, -// client.WithAPIVersionNegotiation(), -// ) +// cli, err := client.New(client.FromEnv) func New(ops ...Opt) (*Client, error) { hostURL, err := ParseHostURL(DefaultDockerHost) if err != nil { diff --git a/vendor/github.com/moby/moby/client/container_logs.go b/vendor/github.com/moby/moby/client/container_logs.go index 636ab221298..b26a3568abc 100644 --- a/vendor/github.com/moby/moby/client/container_logs.go +++ b/vendor/github.com/moby/moby/client/container_logs.go @@ -97,7 +97,23 @@ func (cli *Client) ContainerLogs(ctx context.Context, containerID string, option if options.Follow { query.Set("follow", "1") } - query.Set("tail", options.Tail) + + switch options.Tail { + case "", "all": + // don't send option; default is to show all logs. + // + // The default on the daemon-side is to show all logs; account for + // some special values. The CLI may set a magic "all" value that's + // used as default. + // + // Given that the default is to show all logs, we can ignore these + // values, and don't send "tail". + // + // see https://github.com/moby/moby/blob/0df791cb72b568eeadba2267fe9a5040d12b0487/daemon/logs.go#L75-L78 + // see https://github.com/moby/moby/blob/4d20b6fe56dfb2b06f4a5dd1f32913215a9c317b/daemon/cluster/services.go#L425-L449 + default: + query.Set("tail", options.Tail) + } resp, err := cli.get(ctx, "/containers/"+containerID+"/logs", query, nil) if err != nil { diff --git a/vendor/github.com/moby/moby/client/image_list.go b/vendor/github.com/moby/moby/client/image_list.go index 6df3c66e179..8570709a7f4 100644 --- a/vendor/github.com/moby/moby/client/image_list.go +++ b/vendor/github.com/moby/moby/client/image_list.go @@ -41,6 +41,14 @@ func (cli *Client) ImageList(ctx context.Context, options ImageListOptions) (Ima query.Set("manifests", "1") } } + if options.Identity { + if err := cli.requiresVersion(ctx, "1.54", "identity"); err != nil { + return ImageListResult{}, err + } + // Identity data in image list is scoped to manifests. + query.Set("manifests", "1") + query.Set("identity", "1") + } resp, err := cli.get(ctx, "/images/json", query, nil) defer ensureReaderClosed(resp) diff --git a/vendor/github.com/moby/moby/client/image_list_opts.go b/vendor/github.com/moby/moby/client/image_list_opts.go index a497d5790e0..297ab960c5a 100644 --- a/vendor/github.com/moby/moby/client/image_list_opts.go +++ b/vendor/github.com/moby/moby/client/image_list_opts.go @@ -16,6 +16,9 @@ type ImageListOptions struct { // Manifests indicates whether the image manifests should be returned. Manifests bool + + // Identity indicates whether image identity information should be returned. + Identity bool } // ImageListResult holds the result from ImageList. diff --git a/vendor/github.com/moby/moby/client/internal/jsonmessages.go b/vendor/github.com/moby/moby/client/internal/jsonmessages.go index 03afc4e80a6..31262fd8e28 100644 --- a/vendor/github.com/moby/moby/client/internal/jsonmessages.go +++ b/vendor/github.com/moby/moby/client/internal/jsonmessages.go @@ -11,23 +11,23 @@ import ( "github.com/moby/moby/api/types/jsonstream" ) -func NewJSONMessageStream(rc io.ReadCloser) stream { +func NewJSONMessageStream(rc io.ReadCloser) Stream { if rc == nil { panic("nil io.ReadCloser") } - return stream{ + return Stream{ rc: rc, close: sync.OnceValue(rc.Close), } } -type stream struct { +type Stream struct { rc io.ReadCloser close func() error } // Read implements io.ReadCloser -func (r stream) Read(p []byte) (n int, err error) { +func (r Stream) Read(p []byte) (n int, err error) { if r.rc == nil { return 0, io.EOF } @@ -35,16 +35,18 @@ func (r stream) Read(p []byte) (n int, err error) { } // Close implements io.ReadCloser -func (r stream) Close() error { +func (r Stream) Close() error { if r.close == nil { return nil } return r.close() } +var _ io.ReadCloser = Stream{} + // JSONMessages decodes the response stream as a sequence of JSONMessages. // if stream ends or context is cancelled, the underlying [io.Reader] is closed. -func (r stream) JSONMessages(ctx context.Context) iter.Seq2[jsonstream.Message, error] { +func (r Stream) JSONMessages(ctx context.Context) iter.Seq2[jsonstream.Message, error] { stop := context.AfterFunc(ctx, func() { _ = r.Close() }) @@ -72,7 +74,7 @@ func (r stream) JSONMessages(ctx context.Context) iter.Seq2[jsonstream.Message, } // Wait waits for operation to complete and detects errors reported as JSONMessage -func (r stream) Wait(ctx context.Context) error { +func (r Stream) Wait(ctx context.Context) error { for _, err := range r.JSONMessages(ctx) { if err != nil { return err diff --git a/vendor/github.com/moby/moby/client/request.go b/vendor/github.com/moby/moby/client/request.go index 50c12eb1573..7b1ff743dc9 100644 --- a/vendor/github.com/moby/moby/client/request.go +++ b/vendor/github.com/moby/moby/client/request.go @@ -166,12 +166,12 @@ func (cli *Client) doRequest(req *http.Request) (*http.Response, error) { } if errors.Is(err, os.ErrPermission) { - // Don't include request errors ("Get "http://%2Fvar%2Frun%2Fdocker.sock/v1.51/version"), + // Don't include request errors (Get "http://%2Fvar%2Frun%2Fdocker.sock/v1.51/version"), // which are irrelevant if we weren't able to connect. return nil, errConnectionFailed{fmt.Errorf("permission denied while trying to connect to the docker API at %v", cli.host)} } if errors.Is(err, os.ErrNotExist) { - // Unwrap the error to remove request errors ("Get "http://%2Fvar%2Frun%2Fdocker.sock/v1.51/version"), + // Unwrap the error to remove request errors (Get "http://%2Fvar%2Frun%2Fdocker.sock/v1.51/version"), // which are irrelevant if we weren't able to connect. err = errors.Unwrap(err) return nil, errConnectionFailed{fmt.Errorf("failed to connect to the docker API at %v; check if the path is correct and if the daemon is running: %w", cli.host, err)} @@ -195,13 +195,16 @@ func (cli *Client) doRequest(req *http.Request) (*http.Response, error) { // Although there's not a strongly typed error for this in go-winio, // lots of people are using the default configuration for the docker // daemon on Windows where the daemon is listening on a named pipe - // `//./pipe/docker_engine, and the client must be running elevated. - // Give users a clue rather than the not-overly useful message - // such as `error during connect: Get http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.26/info: - // open //./pipe/docker_engine: The system cannot find the file specified.`. + // ("//./pipe/docker_engine"), and the client must be running elevated. + // + // Give users a clue rather than the not-overly useful message such as; + // + // open //./pipe/docker_engine: The system cannot find the file specified. + // // Note we can't string compare "The system cannot find the file specified" as - // this is localised - for example in French the error would be - // `open //./pipe/docker_engine: Le fichier spécifié est introuvable.` + // this is localized; for example. in French the error would be; + // + // open //./pipe/docker_engine: Le fichier spécifié est introuvable. if strings.Contains(err.Error(), `open //./pipe/docker_engine`) { // Checks if client is running with elevated privileges if f, elevatedErr := os.Open(`\\.\PHYSICALDRIVE0`); elevatedErr != nil { @@ -297,7 +300,7 @@ func checkResponseErr(serverResp *http.Response) (retErr error) { } else { // Fall back to returning the response as-is for situations where a // plain text error is returned. This branch may also catch - // situations where a proxy is involved, returning a HTML response. + // situations where a proxy is involved, returning an HTML response. daemonErr = errors.New(strings.TrimSpace(string(body))) } return fmt.Errorf("Error response from daemon: %w", daemonErr) diff --git a/vendor/github.com/moby/moby/client/service_logs.go b/vendor/github.com/moby/moby/client/service_logs.go index fd565db5a09..57099ffe46b 100644 --- a/vendor/github.com/moby/moby/client/service_logs.go +++ b/vendor/github.com/moby/moby/client/service_logs.go @@ -70,7 +70,22 @@ func (cli *Client) ServiceLogs(ctx context.Context, serviceID string, options Se if options.Follow { query.Set("follow", "1") } - query.Set("tail", options.Tail) + switch options.Tail { + case "", "all": + // don't send option; default is to show all logs. + // + // The default on the daemon-side is to show all logs; account for + // some special values. The CLI may set a magic "all" value that's + // used as default. + // + // Given that the default is to show all logs, we can ignore these + // values, and don't send "tail". + // + // see https://github.com/moby/moby/blob/0df791cb72b568eeadba2267fe9a5040d12b0487/daemon/logs.go#L75-L78 + // see https://github.com/moby/moby/blob/4d20b6fe56dfb2b06f4a5dd1f32913215a9c317b/daemon/cluster/services.go#L425-L449 + default: + query.Set("tail", options.Tail) + } resp, err := cli.get(ctx, "/services/"+serviceID+"/logs", query, nil) if err != nil { diff --git a/vendor/github.com/moby/moby/client/system_events.go b/vendor/github.com/moby/moby/client/system_events.go index b33e02aa3d7..b0ca71a19b0 100644 --- a/vendor/github.com/moby/moby/client/system_events.go +++ b/vendor/github.com/moby/moby/client/system_events.go @@ -45,9 +45,9 @@ func (cli *Client) Events(ctx context.Context, options EventsListOptions) Events } headers := http.Header{} - headers.Add("Accept", types.MediaTypeJSONSequence) - headers.Add("Accept", types.MediaTypeJSONLines) - headers.Add("Accept", types.MediaTypeNDJSON) + headers.Add("Accept", types.MediaTypeJSONLines) // Implicit q=1.0; in case server doesn't parse correctly. + headers.Add("Accept", types.MediaTypeNDJSON+";q=0.9") + headers.Add("Accept", types.MediaTypeJSONSequence+";q=0.5") resp, err := cli.get(ctx, "/events", query, headers) if err != nil { close(started) diff --git a/vendor/modules.txt b/vendor/modules.txt index e6ff5d5ad5a..7820b053c38 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -273,7 +273,7 @@ github.com/moby/docker-image-spec/specs-go/v1 github.com/moby/go-archive github.com/moby/go-archive/compression github.com/moby/go-archive/tarheader -# github.com/moby/moby/api v1.53.0 +# github.com/moby/moby/api v1.54.0 ## explicit; go 1.24.0 github.com/moby/moby/api/types github.com/moby/moby/api/types/blkiodev @@ -292,7 +292,7 @@ github.com/moby/moby/api/types/storage github.com/moby/moby/api/types/swarm github.com/moby/moby/api/types/system github.com/moby/moby/api/types/volume -# github.com/moby/moby/client v0.2.2 +# github.com/moby/moby/client v0.3.0 ## explicit; go 1.24.0 github.com/moby/moby/client github.com/moby/moby/client/internal From 7869198dc5ef4ee4aa9b2bdc133289e0f01f5f4c Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Thu, 5 Mar 2026 17:45:19 -0500 Subject: [PATCH 2/2] Add packaging for newer test helpers I'm not really clear on how these tests passed when the helpers themselves were added for tests. Signed-off-by: Nalin Dahyabhai --- rpm/buildah.spec | 3 +++ tests/tmt/system.fmf | 3 +++ 2 files changed, 6 insertions(+) diff --git a/rpm/buildah.spec b/rpm/buildah.spec index be032ec865b..1aa24853c54 100644 --- a/rpm/buildah.spec +++ b/rpm/buildah.spec @@ -153,6 +153,7 @@ export BUILDTAGS+=" containers_image_sequoia" %gobuild -o bin/passwd ./tests/passwd %gobuild -o bin/crash ./tests/crash %gobuild -o bin/wait ./tests/wait +%gobuild -o bin/grpcnoop ./tests/rpc/noop %{__make} docs %install @@ -168,6 +169,7 @@ cp bin/dumpspec %{buildroot}/%{_bindir}/%{name}-dumpspec cp bin/passwd %{buildroot}/%{_bindir}/%{name}-passwd cp bin/crash %{buildroot}/%{_bindir}/%{name}-crash cp bin/wait %{buildroot}/%{_bindir}/%{name}-wait +cp bin/grpcnoop %{buildroot}/%{_bindir}/%{name}-grpcnoop rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* @@ -196,6 +198,7 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* %{_bindir}/%{name}-passwd %{_bindir}/%{name}-crash %{_bindir}/%{name}-wait +%{_bindir}/%{name}-grpcnoop %{_datadir}/%{name}/test %changelog diff --git a/tests/tmt/system.fmf b/tests/tmt/system.fmf index eb6b766f04e..835f959a35b 100644 --- a/tests/tmt/system.fmf +++ b/tests/tmt/system.fmf @@ -11,6 +11,9 @@ environment: TUTORIAL_BINARY: /usr/bin/buildah-tutorial DUMPSPEC_BINARY: /usr/bin/buildah-dumpspec PASSWD_BINARY: /usr/bin/buildah-passwd + GRPCNOOP_BINARY: /usr/bin/buildah-grpcnoop + WAIT_BINARY: /usr/bin/buildah-wait + CRASH_BINARY: /usr/bin/buildah-crash TMPDIR: /var/tmp adjust: