Commit Graph

4620 Commits

Author SHA1 Message Date
flouthoc 078a7ff78e
Merge pull request #4541 from TomSweeneyRedHat/dev/tsweeney/bumpthecs
Bump c/storagev1.45.3, c/imagev5.24.0, c/commonv0.51.0
2023-01-25 09:29:05 +05:30
tomsweeneyredhat 5e3f26de2f Bump c/storagev1.45.3, c/imagev5.24.0, c/commonv0.51.0
Bump the c/storage, c/image and c/common libraries in preparation for
RHEL 8.8/9.2 and Podman v4.4

Just one more vendor dance left!

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2023-01-24 16:03:23 -05:00
Daniel J Walsh fa880553af
Merge pull request #4537 from edsantiago/reenable_flake
Flake 3710 has been closed. Reenable the test.
2023-01-24 16:01:11 -05:00
dependabot[bot] b70fb17657
build(deps): bump github.com/onsi/gomega from 1.25.0 to 1.26.0
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.25.0 to 1.26.0.
- [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.25.0...v1.26.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-24 15:45:09 -05:00
Daniel J Walsh d5dd0de533
Merge pull request #4534 from containers/dependabot/go_modules/github.com/fsouza/go-dockerclient-1.9.3
build(deps): bump github.com/fsouza/go-dockerclient from 1.9.2 to 1.9.3
2023-01-24 13:59:36 -05:00
Ed Santiago fe0256d38f Flake 3710 has been closed. Reenable the test.
(No, I don't expect the issue to be fixed, but sometimes we need
incentives in order to pay attention to flakes)

Signed-off-by: Ed Santiago <santiago@redhat.com>
2023-01-23 05:56:39 -07:00
OpenShift Merge Robot 4b72f055f1
Merge pull request #4535 from TomSweeneyRedHat/dev/tsweeney/fixlang2
[CI:DOCS] Fix two diversity issues in a tutorial
2023-01-20 17:52:01 -05:00
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
dependabot[bot] 3ef898e417
build(deps): bump github.com/fsouza/go-dockerclient from 1.9.2 to 1.9.3
Bumps [github.com/fsouza/go-dockerclient](https://github.com/fsouza/go-dockerclient) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/fsouza/go-dockerclient/releases)
- [Changelog](https://github.com/fsouza/go-dockerclient/blob/main/container_changes_test.go)
- [Commits](https://github.com/fsouza/go-dockerclient/compare/v1.9.2...v1.9.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-20 09:57:57 -05:00
OpenShift Merge Robot 6dd783f22a
Merge pull request #4530 from rhatdan/VENDOR
vendor in latests containers/(storage, common, image)
2023-01-20 09:40:59 -05:00
Daniel J Walsh 0d87e38b6e
vendor in latests containers/(storage, common, image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-18 18:15:22 -05:00
Daniel J Walsh 9073165e7c
Merge pull request #4524 from containers/dependabot/go_modules/github.com/onsi/gomega-1.25.0
build(deps): bump github.com/onsi/gomega from 1.24.2 to 1.25.0
2023-01-18 18:02:55 -05:00
OpenShift Merge Robot 42f2b38574
Merge pull request #4528 from vrothberg/fix-4520
fix bud-multiple-platform-with-base-as-default-arg flake
2023-01-18 16:47:07 -05:00
Valentin Rothberg 15bdd2aadb fix bud-multiple-platform-with-base-as-default-arg flake
By vendoring c/common (see containers/common/pull/1299).

Fixes: #4520
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2023-01-18 15:39:39 +01:00
Daniel J Walsh 674aa1feea
Merge pull request #4516 from containers/dependabot/go_modules/github.com/fsouza/go-dockerclient-1.9.2
build(deps): bump github.com/fsouza/go-dockerclient from 1.9.0 to 1.9.2
2023-01-18 08:39:13 -05:00
Daniel J Walsh 3f805bcd8c
Merge pull request #4526 from flouthoc/stage-reuse
stage_executor: while mounting stages make sure freshly built stage is used
2023-01-18 08:38:19 -05:00
OpenShift Merge Robot 4f8706bb3e
Merge pull request #4517 from rhatdan/regex
vendor in latests containers/(storage, common, image, ocicyrpt)
2023-01-18 07:05:08 -05:00
Aditya R ac7458e70d
stage_executor: while mounting stages use freshly built stage
When using `--mount=` in RUN instruction and source is a stage make sure
that freshly built stage is used if the stage selected in source was
just rebuilt.

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

Signed-off-by: Aditya R <arajan@redhat.com>
2023-01-18 16:15:16 +05:30
dependabot[bot] e1cfcb240e
build(deps): bump github.com/fsouza/go-dockerclient from 1.9.0 to 1.9.2
Bumps [github.com/fsouza/go-dockerclient](https://github.com/fsouza/go-dockerclient) from 1.9.0 to 1.9.2.
- [Release notes](https://github.com/fsouza/go-dockerclient/releases)
- [Changelog](https://github.com/fsouza/go-dockerclient/blob/main/container_changes_test.go)
- [Commits](https://github.com/fsouza/go-dockerclient/compare/v1.9.0...v1.9.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-18 05:05:25 -05:00
dependabot[bot] d1c82c29a6
build(deps): bump github.com/onsi/gomega from 1.24.2 to 1.25.0
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.24.2 to 1.25.0.
- [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.24.2...v1.25.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-18 05:03:16 -05:00
Daniel J Walsh 4dec253462
vendor in latests containers/(storage, common, image, ocicyrpt)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-17 16:00:11 -05:00
OpenShift Merge Robot c541c355c0
Merge pull request #4523 from giuseppe/tests-fix-runtime-flag-for-crun
tests: change the runtime-flag test for crun
2023-01-17 12:59:51 -05:00
Giuseppe Scrivano c0f6c6b7ad
[Itests: change the runtime-flag test for crun
crun might not print any debugging message, so change the runtime-flag
test to use --log=log-file and test it was created.

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

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2023-01-17 17:37:53 +01:00
OpenShift Merge Robot 39dfa73892
Merge pull request #4519 from vrothberg/readme
[CI:DOCS] README: drop sudo
2023-01-16 11:28:19 -05:00
Valentin Rothberg 186b301685 [CI:DOCS] README: drop sudo
Running the script from the README does not require root privileges.
The text seems to predate Buildah's rootless support.  It was brought to
my attention during a presentation last week where an attendee asked
whether Buildah requires root privileges after reading the README.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2023-01-16 16:27:13 +01:00
OpenShift Merge Robot 9d987b9212
Merge pull request #4514 from cevich/fix_multiarch
[CI:BUILD] Fix multiarch manifest-list build failures
2023-01-14 11:13:56 -05:00
Chris Evich 1950ab687e
Fix multi-arch manifest-list build timeouts
As of this commit, the build script runs the process on x86_64 hardware
(4cpus/8gig) using emulation for foreign architectures.  Due to various
delays, inefficiencies, and other emulation-related slowdowns, it's
possible for dnf to timeout and/or mis-measure a minimum repository
download rate.  Bump up the minimum download rate by 10x and timeout
interval by double.  This should allow the builds to complete more
consistently.

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-01-13 15:11:26 -05:00
Chris Evich d106e425a3
Cirrus: Update VM Images
Of special note: These images use a down-rev kernel which is not subject
to https://bugzilla.redhat.com/show_bug.cgi?id=2159066

Signed-off-by: Chris Evich <cevich@redhat.com>
2023-01-13 10:47:24 -05:00
OpenShift Merge Robot 8ca903bc88
Merge pull request #4511 from nalind/multiple-label
bud: Consolidate multiple synthetic LABEL instructions
2023-01-09 23:09:32 -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 J Walsh 1bd6f909e8
Merge pull request #4509 from flouthoc/secret-relative
build, secret: allow relative mountpoints wrt to work dir for `--mount=type=secret`
2023-01-09 15:17:36 -05:00
Daniel J Walsh ed7a2f7f48
Merge pull request #4482 from dandan2000/patch-1
[CI:DOCS] Update buildah-build.1.md
2023-01-09 13:21:47 -05:00
Aditya R 9fced965ee
build, secret: allow realtive mountpoints wrt to work dir
When working with `--mount=type=secret` allow `target`/`dst` to accept relative paths w.r.t to the configured work dir.

See detailed use-case here: https://github.com/containers/buildah/issues/4491

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

**Steps to reproduce the issue from #4491:**

1. Create Dockerfile and Makefile:

Dockerfile:
```
FROM docker.io/ubuntu:22.04

WORKDIR /somedir

RUN --mount=type=secret,id=secret-foo,dst=secret1.txt --mount=type=secret,id=secret-bar,dst=secret2.txt \
     printf "PWD=%s\n" "$(pwd)" && ls -la && ls -la / && stat secret1.txt && stat secret2.txt && \
     cp secret1.txt /root/secret-foo.txt && \
     cp secret2.txt /root/secret-bar.txt
```

Makefile:
```
DOCKER ?= docker

.PHONY: build-container

build-container:
	rm -rf build
	mkdir build
	echo "secret:foo" >build/secret1.txt
	echo "secret:bar" >build/secret2.txt
	buildah --no-cache --secret id=secret-foo,src=build/secret1.txt --secret id=secret-bar,src=build/secret2.txt -t defanator/example:tag1 .
	podman run --rm -t -i defanator/example:tag1 cat /root/secret-foo.txt
	podman run --rm -t -i defanator/example:tag1 cat /root/secret-bar.txt
	podman rmi defanator/example:tag1
```
```
make
```

Signed-off-by: Aditya R <arajan@redhat.com>
2023-01-09 23:34:55 +05:30
OpenShift Merge Robot 11921359a9
Merge pull request #4510 from containers/dependabot/go_modules/github.com/containerd/containerd-1.6.15
build(deps): bump github.com/containerd/containerd from 1.6.14 to 1.6.15
2023-01-06 14:19:47 -05:00
Daniel Celentano 938c035566 fixed squash documentation
Signed-off-by: Daniel Celentano <dacelent@redhat.com>
2023-01-06 11:26:20 -03:00
dependabot[bot] 59da1a7f73
build(deps): bump github.com/containerd/containerd from 1.6.14 to 1.6.15
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.6.14 to 1.6.15.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.6.14...v1.6.15)

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

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-06 08:38:09 -05:00
Daniel J Walsh c44efcfb75
Merge pull request #4507 from eschnett/patch-2
Correct minor typo in comment
2023-01-05 13:41:43 -05:00
Daniel J Walsh 2f3576b4e2
Merge pull request #4505 from rhatdan/VENDOR
Vendor in latest containers/(common, image, storage)
2023-01-05 13:40:52 -05:00
Erik Schnetter 4952862a22
Correct minor comment
[NO NEW TESTS NEEDED]

Signed-off-by: Erik Schnetter <schnetter@gmail.com>
2023-01-05 13:16:11 -05:00
OpenShift Merge Robot 2f25e14b5e
Merge pull request #4502 from edsantiago/bats_fixes
system tests: remove unhelpful assertions
2023-01-05 12:01:25 -05:00
Daniel J Walsh 820fafc889
Vendor in latest containers/(common, image, storage)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-01-05 10:33:40 -05:00
Ed Santiago a75b263f75 system tests: remove unhelpful assertions
Regular primitive bats uses assertions like '[ $foo = something ]'.
These are worthless for debugging: when they fail, all you know
is that foo is not "something" but you don't know what foo _is_.

Find and replace those assertions with 'assert', which is
more informative. Instances found via:

   $ ack '^ *\[' tests/*.bats

There are many matches for 'test' (instead of '[') but those
mostly look like file-existence ones, which are less evil
than string-check tests. I'm leaving those be for now.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2023-01-05 08:20:25 -07:00
OpenShift Merge Robot d1f2cc000c
Merge pull request #4490 from flouthoc/buildah-prune
buildah: add `buildah prune` command and expose `CleanCacheMount` API
2023-01-05 09:34:58 -05: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
OpenShift Merge Robot d2e7a94cbf
Merge pull request #4495 from flouthoc/bump-storage-to-a747b27
vendor: bump c/storage to `a747b27`
2023-01-04 12:18:56 -05:00
Aditya R a5e1775864
vendor: bump c/storage to a747b27
CI in other projects which uses podman is blocked because of missing containers/storage#1455 Update c/storage to a747b27 so it contains patch from containers/storage#1455

[NO NEW TESTS NEEDED]
[NO TESTS NEEDED]

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

Signed-off-by: Aditya R <arajan@redhat.com>
2023-01-04 10:01:49 +05:30
Daniel J Walsh f8eb73820a
Merge pull request #4452 from flouthoc/relative-mount
build, mount: allow realtive mountpoints wrt to work dir for `--mount=type=cache` and `--mount=type=bind`
2023-01-03 08:33:18 -05:00
OpenShift Merge Robot d87b736c39
Merge pull request #4479 from rhatdan/group
Add support for --group-add to buildah from
2022-12-22 15:32:58 -05:00
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
OpenShift Merge Robot 22cc868b37
Merge pull request #4478 from containers/dependabot/github_actions/actions/stale-7
build(deps): bump actions/stale from 6 to 7
2022-12-21 13:52:31 -05:00