Commit Graph

481 Commits

Author SHA1 Message Date
Aditya R f888b3d84b
buildah: add --layer-label for setting labels on layers
`--layer-label` allows users to set labels on intermediate labels agnostic
of the labels set on actual image. Since there are use-cases where users
want to perform operation on intermediate images only on the basis of
certain labels.

Closes: https://github.com/containers/buildah/issues/4933

Signed-off-by: Aditya R <arajan@redhat.com>
2023-08-03 12:09:12 +05:30
Aditya R b9ac8d5e01
manifest/push: add support for --add-compression
Adds support for `--add-compression` which accepts multiple compression
formats and when used it will add all instances in a manifest list with
requested compression formats.

Signed-off-by: Aditya R <arajan@redhat.com>
2023-07-31 20:24:18 +05:30
Aditya R d27a823568
manifest/inspect: add support for tls-verify and authfile
Add flags for `manifest inspect` i.e `--tls-verify` and `--authfile`

Signed-off-by: Aditya R <arajan@redhat.com>
2023-07-31 20:24:10 +05:30
Paul Holzinger 74b885b9e2
buildah: add pasta(1) support
Like podman allow buildah and therefore podman build to use the network
mode pasta. The pasta integration is very simple and we do not even
need a teardown handler for that as pasta will exit on its own when the
netns path is removed.

However right now this is broken, pasta will fail to open
/proc/$pid/ns/net. I send a patch[1] to fix this upstream in pasta.
I assume this will land quickly so I like to get this in now just so we
have this included in podman v4.6. Thus the test is skipped for now.

[1] https://archives.passt.top/passt-dev/20230623082531.25947-2-pholzing@redhat.com/

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-23 13:58:34 +02:00
Paul Holzinger 11ba328e2b
use slirp4netns package from c/common
This uses the same code as podman for slirp4netns, this means
- ipv6 is enabled by default
- slirp4netns options are read from contianers.conf
- slirp4netns options can now be set on the cli. This required some
small rework on where we parse the network string.

Lastly I updated the --network docs, to document the new slirp4netns
mode. That included fixing up buildah-from and buildah-run pages which
were incomplete in that regard. Now we show the same for all options.

Fixes #3968

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-23 13:57:30 +02:00
Kir Kolyshkin bd32a04c37 Remove device mapper support
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2023-06-12 12:43:16 -07:00
Kir Kolyshkin 5eb356bb8b docs/Makefile: don't show sed invocations
When running `make`, about 99% of the output looks like this:

sed -e 's/\((buildah[^)]*\.md\(#.*\)\?)\)//g' \
 -e 's/\[\(buildah[^]]*\)\]/\1/g' \
 -e 's/\[\([^]]*\)](http[^)]\+)/\1/g' \
 -e 's;<\(/\)\?\(a\|a\s\+[^>]*\|sup\)>;;g' \
 -e 's/\\$/  /g' buildah-unshare.1.md  | \
../tests/tools/build/go-md2man -in /dev/stdin -out  buildah-unshare.1
sed -e 's/\((buildah[^)]*\.md\(#.*\)\?)\)//g' \
 -e 's/\[\(buildah[^]]*\)\]/\1/g' \
 -e 's/\[\([^]]*\)](http[^)]\+)/\1/g' \
 -e 's;<\(/\)\?\(a\|a\s\+[^>]*\|sup\)>;;g' \
 -e 's/\\$/  /g' buildah-version.1.md  | \
../tests/tools/build/go-md2man -in /dev/stdin -out  buildah-version.1

As much as I love sed, this is not what I would want to stare at in
CI logs etc.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2023-06-02 16:34:18 -07:00
rijenkii 7e327cf183 Add a warning to `--secret` docs
[NO NEW TESTS NEEDED]

Signed-off-by: rijenkii <me@rijenkii.tk>
2023-05-30 22:12:28 +07:00
Andreas Mack 371bc34fe4 Fix auth.json path (validated on Fedora 38)
wq
Signed-off-by: Andreas Mack <andreas.mack@gmail.com>

Signed-off-by: Andreas Mack <andreas.mack@konsec.com>
2023-05-23 11:37:34 +02:00
Aditya R b37c4ee438
build: --platform must accept only arch
Make error message for `--platform` more clear and use
`platforms.Parse(` so `--platform` can automatically detect `OS` if not
specified.

Closes: https://github.com/containers/podman/issues/18194
Closes: https://github.com/containers/buildah/issues/4756

Signed-off-by: Aditya R <arajan@redhat.com>
2023-04-27 13:43:20 +05:30
Daniel J Walsh 43440ec6e4
Clarify the need for qemu-user-static package
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-04-13 07:11:14 -04:00
Daniel J Walsh 9463954942
Update docs/buildah-build.1.md
Co-authored-by: Nalin Dahyabhai <nalin@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-03-28 17:48:33 -04:00
Jack Wearden aad1e994a0 code review
Signed-off-by: Jack Wearden <jack@jackwearden.co.uk>
2023-03-26 17:21:47 +01:00
Jack Wearden 3afa5ca74d build: accept arguments from file with --build-arg-file
Allows codifying build arguments into a structured file, perhaps one
named arguments.Containerargs

The build arg file also accepts comments starting #, so automated
tooling or CI/CD workflows can monitor arguments like versions to
ensure they are up-to-date.

Signed-off-by: Jack Wearden <jack@jackwearden.co.uk>
2023-03-25 11:04:23 +00:00
Aditya R c1b82d195a
build: document behaviour of buildah's distributed cache
Buildah's `--cache-to` and `--cache-from` is different from
docker/buildkit so lets document that and mention how is it different.

Closes: https://github.com/containers/buildah/issues/4612

Signed-off-by: Aditya R <arajan@redhat.com>
2023-03-07 20:38:29 +05:30
Steffen Straub 0ed9b4c8cd Fix tutorial for rootless mode
Before executing `buildah unshare` for mounting a container from scratch
as a non-root user, we need to export the variable `newcontainer` so
that it is known inside the modified user namespace.

Signed-off-by: Steffen Straub <22006250+Steffen1989@users.noreply.github.com>
2023-03-01 18:03:15 +01:00
Nalin Dahyabhai 0b7a7f80bb docs/tutorials/04: add defaults for Run()
In the tutorial, switch to calling `DefaultStoreOptionsAutoDetectUID()`
instead of `DefaultStoreOptions()`, which should figure things out
better.

In the tutorial, add an example of using Run(), where for API backward
compatibility reasons, we can't tell the difference between "grant no
capabilties by default" and "grant the default set of capabilities by
default".

The default isolation can be set automatically, so start doing that at
run-time, but have the tutorial look it up anyway because the tutorial
on the web will be newer than our current release for at least a while.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-02-21 08:59:43 -05:00
Daniel J Walsh 8125e45a58
Fix documentation on which Capabilities are allowed by default
Buildah uses the default list of capabilities as specified in
containers.conf. The man pages should reflect this.

Fixes: https://github.com/containers/buildah/issues/4576

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-02-16 07:09:58 +02:00
Aditya R dbf1d43b34
docs: specify order preference for FROM
When multiple files are specified buildah considers `FROM` instruction
from the last file specified and so does `buildkit` and `docker` so lets
specify that in docs.

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Closes: https://github.com/containers/buildah/issues/4544

Signed-off-by: Aditya R <arajan@redhat.com>
2023-01-30 17:21:42 +05:30
tomsweeneyredhat f9ef51cbb1 [CI:DOCS] Fix two diversity issues in a tutorial
Touch up a couple of diversity issues in one of the tutorials.

Changes the word "master" to "primary".

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2023-01-20 17:32:47 -05:00
Nalin Dahyabhai 67ab55bbb7 bud: Consolidate multiple synthetic LABEL instructions
We handle --label command line arguments by appending LABEL instructions
to the Dockerfile contents before we parse it.  Previously, we were
appending a separate line for each label-value pair.  Consolidate them
for the sake of tools that arbitrarily limit the length of histories
that they're willing to accept in images (boo!).

Add a similar implementation for --env command line arguments.
Previously, we'd set them in the initial configuration for each stage
and also set them at commit-time, and that potentially overrode any
values that were explicitly in the stage itself, and which would have
affected RUN instructions.  Remove the set-at-commit-time logic so that
the history reflects what ends up in the image.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2023-01-09 16:45:10 -05:00
Daniel Celentano 938c035566 fixed squash documentation
Signed-off-by: Daniel Celentano <dacelent@redhat.com>
2023-01-06 11:26:20 -03:00
Aditya R 3566683896
buildah: add prune command and expose CleanCacheMount API
* Just like buildkit buildah must allow cleaning the buildcache and cache
generated on host by `--mount=type=cache` just like buildkit's `prune`
command.

* Also expose `CleanCacheMount` API so other tools like `podman` can use
  it.

See: https://github.com/moby/buildkit#cache
Closes: https://github.com/containers/buildah/issues/4486

Signed-off-by: Aditya R <arajan@redhat.com>
2023-01-05 17:32:42 +05:30
Daniel J Walsh 60be7f2509
Add support for --group-add to buildah from
Allow containers running under buildah to use
--group-add keep-groups, so that they can inherit
access to the users groups.

Also allow users to add supplimental groups to the container.

Fixes: https://github.com/containers/buildah/issues/4476

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-12-22 11:53:00 -05:00
Daniel J Walsh e33bb86787
Add documentation for buildah build --pull=missing
Fixes: https://github.com/containers/buildah/issues/3921

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-12-20 15:43:57 -05:00
Aditya R ffed850367
remote-cache: support multiple sources and destinations
Buildah must support multiple sources for remote cache when using
`--cache-to` and `--cache-from` so users can distribute and collect
cache from various sources.

We also need for compat with buildkit api which in past broke `podman`
compat build API see: https://github.com/containers/podman/pull/16380

More discussion here: https://github.com/containers/podman/pull/16380

Signed-off-by: Aditya R <arajan@redhat.com>
2022-12-05 12:10:41 +05:30
Daniel J Walsh d4c661a774
Add no-new-privileges flag
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-11-04 11:43:29 -04:00
Mattias Warnqvist 87e379d5b7
Fix word missing in Container Tools Guide
Signed-off-by: Mattias Warnqvist <mwq@users.noreply.github.com>
2022-10-25 10:15:53 +02:00
Daniel J Walsh dc81652ffa
Fix man pages to match latest cobra settings
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-10-12 07:23:00 -04:00
Daniel J Walsh f0bee4ee3d
Merge pull request #4250 from rhatdan/dns
Prevent use of --dns* options with --net=none
2022-09-19 13:47:00 -04:00
Aditya R 3c092e5edd
build: support --skip-unused-stages for multi-stage builds
In multi-stage builds buildah will skip stages which are unused (i.e
stages which don't contribute anything to target stage directly or
indirectly) however in certain cases users need to process these unused
stages hence add support for `--skip-unused-stages` which allows users
to control this behaviour.

Ref: https://github.com/GoogleContainerTools/kaniko#flag---skip-unused-stages

Closes: https://github.com/containers/buildah/issues/4243

Signed-off-by: Aditya R <arajan@redhat.com>
2022-09-17 12:51:15 +05:30
Daniel J Walsh 87d4ae8864
Prevent use of --dns* options with --net=none
This is blocked in Podman for run and create but not
for build, we should block it also for build.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-09-15 15:10:58 -04:00
Aditya R fd14bfe545
buildah: make --cache-ttl=0s equivalent to --no-cache
If user explicitly specified `--cache-ttl=0s
it would effectively mean that user is asking
to use no cache at all. In such use cases
buildah can skip looking for cache entierly
by setting `--no-cache=true` internally.

Closes: https://github.com/containers/buildah/issues/4244

Signed-off-by: Aditya R <arajan@redhat.com>
2022-09-15 15:55:07 +05:30
Aditya R 9f435de84e
manifest: add support for buildah manifest exists
Adds support for `buildah manifest exists <name>` which tells user if
requested manifest is present in local storage or not, if manifest is
present in local-storage command exits with exit code 0 otherwise 1.

Similar to: https://docs.podman.io/en/latest/markdown/podman-manifest-exists.1.html

Closes: https://github.com/containers/buildah/issues/4217

Signed-off-by: Aditya R <arajan@redhat.com>
2022-09-06 20:06:01 +05:30
Aditya R f46ef3b2d7
buildah: support for --retry and --retry-delay for push/pull failures
Allows users to configure `--retry` attempts and `--retry-delay`
duration using two additional flags for commands

* buildah build
* buildah pull
* buildah push
* buildah from
* buildah add
* buildah copy

Closes: https://github.com/containers/buildah/issues/4018

Not sure how we can test retry attempts in CI, but added a test in
tests/bud.bats which verfies we parse and added flag in other options
for sanity parsing checking.

Signed-off-by: Aditya R <arajan@redhat.com>
2022-08-23 12:31:01 +05:30
Aditya R 90cf4fc00b
mount,cache: enable SElinux shared content label option by default
`--mount=type=cache` is buildah's internal construct and actual location
is not managed by user so enable `z` by default is `SELinux` is enabled
on the host machine, instead of asking users to do it.

Signed-off-by: Aditya R <arajan@redhat.com>
2022-08-19 20:07:12 +05:30
Nalin Dahyabhai 9637a24425 cmd/buildah: add "manifest create --amend"
When `buildah manifest create` is given the `--amend` flag and a list
with the name that was specified for the to-be-created list already
exists, just reuse the list.

Make the `--insecure` flag, if we see it, conflict with `--tls-verify`,
but have the reverse of the effect that `--tls-verify` does, and teach
the `buildah manifest` `add`, `create`, and `push` subcommands about
it.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-08-16 19:43:41 -04:00
Aditya R 17e6fe01c2 docs: specify git protocol is not supported for github hosted repo
Build from URL does not supports `git://` is source is hosted on Github.
Reason: https://github.blog/2021-09-01-improving-git-protocol-security-github/

[CI:DOCS]
[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

Closes: https://github.com/containers/buildah/issues/4103

Signed-off-by: Aditya R <arajan@redhat.com>
2022-08-11 13:30:54 +05:30
Aditya R b7f51ea3d7
build: support filtering cache by duration using --cache-ttl
`build` or `bud` now supports a new flag `--cache-ttl` which accepts
duration and allows end users to ignore cache images which are not under
the specified duration.

Following flag is useful for setups/platforms which heavily relies on
`--layer` and buildah caching but want recompute certain `RUN` steps
after specified duration to make sure specific `RUN` steps are always
updated. Example `RUN dnf update` or `RUN dnf install`

Closes: https://github.com/containers/buildah/issues/4160
Somewhat similar to kaniko's: https://github.com/GoogleContainerTools/kaniko#--cache-ttl-duration

Signed-off-by: Aditya R <arajan@redhat.com>
2022-08-05 11:50:15 +05:30
Aditya R b218fdf322
build: support building from commit when using git repo as build context
When using URL to a git repo as build context allow specifying `commit`
to make sure specific `commit` is used as the build context.

Examples

```console
buildah build -t test myrepo.git#abcef123
buildah build -t test myrepo.git#abcef123
buildah build -t test myrepo.git#abcef123:somesubdir
```
Closes: https://github.com/containers/buildah/issues/4148

Signed-off-by: Aditya R <arajan@redhat.com>
2022-08-03 18:50:44 +05:30
Nalin Dahyabhai 5f34c5e2fa Fix a copy/paste error
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2022-08-01 14:31:27 -04:00
Aditya R 6f660bde17
build,cache: support pulling/pushing cache layers to/from remote sources
Following commit

* Initiates `cacheKey` or `layerKey` for intermediate images generated
  for layers.
* Allows end users to upload cached layers with `cacheKey` to remote
  sources using `--cache-to`. `--cache-to` is a optional flag to be used
with `buildah build` which publishes cached layers to remote sources.
* Allows end users to use cached layers from `remote` sources with
  `--cache-from`. `--cache-from` is a optional flag to be used with
`buildah build` and it pulls cached layers from remote sources in a step
by step manner only if is a valid cache hit.

Example
* Populate cache source or use cached layers if already present
```bash
buildah build -t test --layers --cache-to registry/myrepo/cache --cache-from registry/myrepo/cache .
```

Future:
* `cacheKey` or `layerKey` model is only being used when working with
  remote sources however local cache lookup can be also optimized if its
is altered to use `cacheKey` model instead of iterating through all the
images in local storage. As discussed here

References:
* Feature is quite similar to `kaniko`'s `--cache-repo`: https://github.com/GoogleContainerTools/kaniko#--cache-repo

Closes: issues#620

Signed-off-by: Aditya R <arajan@redhat.com>
2022-07-26 01:49:13 +05:30
Aditya R eb4ec4a9ea
docs, run: show SELinux label flag for cache and bind mounts
Buildah cache and bind mounts already support setting SELinux label on
the mounted destination lets document that.

See: https://github.com/containers/buildah/blob/main/tests/bud/buildkit-mount/Dockerfilecachewrite

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]
[CI:DOCS]

Closes: https://github.com/containers/podman/issues/14964

Signed-off-by: Aditya R <arajan@redhat.com>
2022-07-19 15:16:48 +05:30
Valentin Rothberg 48c888a6b3 [CI:DOCS] improve pull-policy documentation
Going through containers/podman/issues/14846 let me improve the
code documentation in containers/common/pull/1085 which is now
copied over to Buildah and will eventually into Podman.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-07-07 16:29:43 +02:00
Aditya R 5686018e79
build: support OCI hooks for ephemeral build containers
Following PR adds support for OCI hooks attached to each of ephemeral
build contains which are created by `RUN` step invoked during `buildah
build` command.

Following PR also adds `--hooks-dir` flag to `buildah build` option
which allows end-users to specify one or more configuration directories
for OCI-hooks.

Note: Following PR migrates `pkg/hooks` from `podman` to `buildah` so
buildah could implement this feature and once merged `podman` can start
using `buildah/pkg/hooks`.

For usage see man-page and example test-case.

See: https://github.com/opencontainers/runtime-spec/blob/main/config.md#posix-platform-hooks

Closes: https://github.com/containers/buildah/issues/4068

Signed-off-by: Aditya R <arajan@redhat.com>
2022-06-28 11:21:28 +05:30
Aditya R 20c5c5c6d8
build, userns: add support for --userns=auto
Buildah now supports `--userns=auto` which can automatically pick an empty range and create an user namespace for the container.

The `--userns=auto` flag, requires that the user name containers and a range of subordinate user ids that the build container is allowed to use be specified in the /etc/subuid and /etc/subgid files.

Example: `containers:2147483647:2147483648`.

Buildah allocates unique ranges of UIDs and GIDs from the containers subordinate user ids. The size of the ranges is based on the number of UIDs required in the image. The number of UIDs and GIDs can be overridden with the size option.

Valid auto options:

    * gidmapping=CONTAINER_GID:HOST_GID:SIZE: to force a GID mapping to be present in the user namespace.

    * size=SIZE: to specify an explicit size for the automatic user namespace. e.g. --userns=auto:size=8192. If size is not specified, auto will estimate a size for the user namespace.

    * uidmapping=CONTAINER_UID:HOST_UID:SIZE: to force a UID mapping to be present in the user namespace.

Signed-off-by: Aditya R <arajan@redhat.com>
2022-06-20 13:08:02 +05:30
Lokesh Mandvekar 7cf6dbd44d
[CI:DOCS] Tutorial 04 - Include Debian/Ubuntu deps
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-06-06 14:51:57 -04:00
Aditya R 495add9369
build, multiarch: support splitting build logs for --platform
Support splitting build logs for multi-arch builds ( `--platform` ) by
using `--logfile` and `--logsplit` which splits generated log file in the
convention `${file}_${platform_os}_${platform_arch}`.

Closes: https://github.com/containers/buildah/issues/3960

Signed-off-by: Aditya R <arajan@redhat.com>
2022-06-06 20:23:23 +05:30
Aditya R c61ecc6964
build, commit: allow disabling image history with --omit-history
As per `OCI` `image-spec` setting history is optional so buildah must
support these use-cases via `--omit-history=true` some of the use-cases
are discussed below.

* There are use-cases when image-spec contributes to the image size by
  adding build history to image-spec in certain use-cases this image
history is not required by the end-users but there is no way to remove
it. See: https://github.com/containers/buildah/issues/3513

* Certain build tools don't honor setting build history in image spec
  however buildah does not allow processing images without build history
since setting build history is still optional as per `OCI` image-spec
( https://github.com/opencontainers/image-spec/blob/main/config.md#properties)
so buildah must support such use-cases.

Closes: https://github.com/containers/buildah/issues/4025
Closes: https://github.com/containers/buildah/issues/3513

Signed-off-by: Aditya R <arajan@redhat.com>
2022-06-03 00:40:48 +05:30
Aditya R c2adbade7c
buildkit: supports additionalBuildContext in builds via --build-context
As builds got more complicated, the ability to only access files from one location became quite limiting. With `multi-stage` builds where you can `copy` files from other parts of the Containerfile by adding the `--from` flag and pointing it to the name of another Containerfile stage or a remote image.

The new named build context feature is an extension of this pattern. You can now define additional build contexts when running the build command, give them a name, and then access them inside a Dockerfile the same way you previously did with build stages.

Additional build contexts can be defined with a new `--build-context [name]=[value]` flag. The key component defines the name for your build context and the value can be:

```console

    Local directory – e.g. --build-context project2=../path/to/project2/src
    HTTP URL to a tarball – e.g. --build-context src=https://example.org/releases/src.tar
    Container image – Define with a docker-image:// prefix, e.g. --build-context alpine=docker-image://alpine:3.15, ( also supports docker://, container-image:// )
```

On the Containerfile side, you can reference the build context on all commands that accept the “from” parameter. Here’s how that might look:
```Dockerfile
FROM [name]
COPY --from=[name] ...
RUN --mount=from=[name] …
```

The value of [name] is matched with the following priority order:

* Named build context defined with `--build-context [name]=..`
* Stage defined with `AS [name]` inside Dockerfile
* Remote image `[name]` in a container registry

Added Features

* Pinning images for `FROM` and `COPY`
* Specifying multiple buildcontexts from different projects
  and using them with `--from` in `ADD` and `COPY` directive
* Override a Remote Dependency with a Local One.
* Using additional context from external `Tar`

Signed-off-by: Aditya R <arajan@redhat.com>
2022-05-17 23:43:51 +05:30