1
0
mirror of https://github.com/containers/buildah.git synced 2026-02-05 18:44:58 +01:00
Commit Graph

2728 Commits

Author SHA1 Message Date
Toomas Vendelin
0dba767afe Added required devel packages
Signed-off-by: Toomas Vendelin <toomas.vendelin@gmail.com>
2021-01-21 19:23:02 +01:00
OpenShift Merge Robot
d460e2ed0d Merge pull request #2924 from containers/gating_test_SAN_fix
Workaround for RHEL gating test failure
2021-01-21 08:44:17 -05:00
Ed Santiago
c48ab4ab61 Workaround for RHEL gating test failure
One of the auth tests is failing on RHEL8.4:

   # buildah push --tls-verify=true ...
   Get "https://localhost:5000/v2/": x509: certificate relies on legacy Common Name field, use SANs or temporarily enable Common Name matching with GODEBUG=x509ignoreCN=0

(Expected output: ' x509: certificate signed by unknown authority')

Cause: who knows? Some internal Go change.

Solution: set magic GODEBUG envariable in the buildah invocation.
This makes that message go away, and gives us the expected one.

Indicate that this may be a temporary workaround. I vaguely
recall reading that a future version of Go would remove it.
We'll deal with that then.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2021-01-20 13:46:36 -07:00
OpenShift Merge Robot
3f5ba7efc2 Merge pull request #2920 from containers/dependabot/go_modules/github.com/stretchr/testify-1.7.0
build(deps): bump github.com/stretchr/testify from 1.6.1 to 1.7.0
2021-01-18 10:57:05 -05:00
OpenShift Merge Robot
4e549753aa Merge pull request #2919 from containers/dependabot/go_modules/github.com/mattn/go-shellwords-1.0.11
build(deps): bump github.com/mattn/go-shellwords from 1.0.10 to 1.0.11
2021-01-18 10:50:22 -05:00
OpenShift Merge Robot
6f554d8f34 Merge pull request #2918 from TomSweeneyRedHat/dev/tsweeney/bumpback
Reset upstream branch to dev version
2021-01-18 07:48:16 -05:00
dependabot-preview[bot]
8654f5f0e4 build(deps): bump github.com/stretchr/testify from 1.6.1 to 1.7.0
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.6.1 to 1.7.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.6.1...v1.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-18 07:43:48 -05:00
dependabot-preview[bot]
f82eb0867e build(deps): bump github.com/mattn/go-shellwords from 1.0.10 to 1.0.11
Bumps [github.com/mattn/go-shellwords](https://github.com/mattn/go-shellwords) from 1.0.10 to 1.0.11.
- [Release notes](https://github.com/mattn/go-shellwords/releases)
- [Commits](https://github.com/mattn/go-shellwords/compare/v1.0.10...v1.0.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-18 07:43:15 -05:00
TomSweeneyRedHat
2efb6cc555 Reset upstream branch to dev version
Reset back to v1.20.0-dev for the upstream branch.
Any 1.19.* releases should come out of that release branch.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-01-16 12:11:39 -05:00
OpenShift Merge Robot
d10dbf3545 Merge pull request #2913 from rhatdan/overlay
If destination does not exists, do not throw error
2021-01-15 04:00:00 -05:00
Daniel J Walsh
0fcc8ff8f5 If destination does not exists, do not throw error
When using volume mounts, the destination directory will get
created if it does not exists. The current code blows up when
the destination directory did not exists.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-14 21:42:32 -05:00
Daniel J Walsh
f17ccd0c11 Merge pull request #2911 from rhatdan/release-1.19
Fix version of release to v1.19.1
2021-01-14 16:50:20 -05:00
Daniel J Walsh
aba61cdec4 Fix version of release to v1.19.1
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
v1.19.1
2021-01-14 16:47:41 -05:00
OpenShift Merge Robot
b595a98aac Merge pull request #2908 from vrothberg/fix-2904
use local image name for pull policy checks
2021-01-14 07:42:20 -05:00
Valentin Rothberg
0d2fcd9cb8 use local image name for pull policy checks
Some pull policies require to first look up a local image and compare
that to the remote counter part.  When looking up the remote image, we
need to make sure to use the name of the local image, if it exists.

This fixes a bug where a short name resolved to an image with the
"localhost/" prefix.  This prefix is only used for local image look ups
via `shortnames.ResolveLocally`.  Hence, when looking up the remote
counter part, we must preserve this prefix.

Fixes: #2904
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2021-01-14 10:28:35 +01:00
OpenShift Merge Robot
2e1bbc2916 Merge pull request #2898 from containers/dependabot/go_modules/github.com/fsouza/go-dockerclient-1.7.0
build(deps): bump github.com/fsouza/go-dockerclient from 1.6.6 to 1.7.0
2021-01-14 04:18:53 -05:00
OpenShift Merge Robot
66431fbe7c Merge pull request #2631 from cevich/new_images
Cirrus: Use images from automation_images
2021-01-14 04:10:11 -05:00
OpenShift Merge Robot
80181e8f33 Merge pull request #2906 from ashley-cui/common331
Vendor in common 0.33.1
2021-01-13 15:20:50 -05:00
Ashley Cui
6db6cf7785 Vendor in common 0.33.1
As per title

Signed-off-by: Ashley Cui <acui@redhat.com>
2021-01-13 13:10:55 -05:00
Chris Evich
024d0091db Fix conformance test false-failures
Prior to Docker 20.10, failed COPY/ADD instructions result in error
messages containing the string `no such file or directory`.  This was
changed in docker to a string containing `file not found`.  Since
the conformance tests potentially need to work with multiple docker
versions, they need to be sensitive to both errors.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-01-12 16:26:43 -05:00
Chris Evich
c74084a21a Fix config-flags-verification test on F33
On newer versions of `time`, the error message quotes the bad value.
This leads to an erroneous failure in the test:

```
working-container
time: invalid duration ABCD'
time: invalid duration "ABCD"'
```

The comparison used for `expect_output --substrig` supports basic
regular expressions.  Encode the expected value in the test to be
tolerant of quoting in the output value.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-01-12 16:26:43 -05:00
Chris Evich
abf3f0d554 Fix bud capabilities test
This test fails after updating to new VM images which include
https://github.com/containers/common/pull/319

Work around the problem by adding in the capabilities expected
to be present.  Thanks to @edsantiago and @giuseppe for the fix.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-01-12 16:26:43 -05:00
Chris Evich
bc9c02f68d Cirrus: Support new VM Images in get_ci_vm.sh
Due to necessary changes in both scripts and within images, updates are
necessary for this script to function.  These changes also bring
the script very close to being identical to the same in the
containers/podman repository.  The intent is to support a future
where this script can simply be shared across repos.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-01-12 16:26:43 -05:00
Chris Evich
5672097146 Cirrus: Make tests pass with new VM Images
Also, utilize the common library functions from containers/automation.
This library is now pre-installed into the VM images. There are some
minor API differences to a few frequently used functions.  Otherwise
the behaviors are largely identical.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-01-12 16:26:43 -05:00
Chris Evich
f4553e7c09 Cirrus: Collect cri-o-runc version
Signed-off-by: Chris Evich <cevich@redhat.com>
2021-01-12 16:26:42 -05:00
Chris Evich
d67dcf7c7d Cirrus: Update VM Images + Rearrange tasks
Utilize VM Images produced from the containers/automation_images repo.
Also, rearrange tasks to more closely match their runtime dependency
order.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-01-12 16:26:42 -05:00
Chris Evich
120edb6ac6 Cirrus: Clarify task names / improve readability
This change mirrors a similar change made in early 2020 for the
containers/podman repository.  Primarily, it alters the appearance of
the task names in the Github WebUI to be more readable by humans.
Also, the former "gate" task is renamed to "smoke".  This prevents
confusion with downstream Fedora/RHEL post-packaging testing which
is(also referred to as the "gate" tests.

Finally, task-dependencies are altered to support a cleaner flow which
will be implemented in a future commit.

Signed-off-by: Chris Evich <cevich@redhat.com>
2021-01-12 16:26:42 -05:00
OpenShift Merge Robot
cfb3372985 Merge pull request #2903 from nalind/default-bic
Stop overriding the location of the blob info cache
2021-01-12 12:04:02 -05:00
Nalin Dahyabhai
6a1f29e343 Stop overriding the location of the blob info cache
When it was first introduced, the blob info cache's location didn't
change from the system-wide default location when we were running in
rootless mode, so we started setting its location ourselves to avoid
triggering permissions errors when updating it.

The image library has since started taking into account that it was
running in rootless mode, but its hardwired default isn't the same as
the one we were setting, so we ended up creating a second cache file.

Stop doing that.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2021-01-12 10:26:21 -05:00
dependabot-preview[bot]
aeaedccc4d build(deps): bump github.com/fsouza/go-dockerclient from 1.6.6 to 1.7.0
Bumps [github.com/fsouza/go-dockerclient](https://github.com/fsouza/go-dockerclient) from 1.6.6 to 1.7.0.
- [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.6.6...v1.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-11 08:51:57 -05:00
OpenShift Merge Robot
8d89b8000e Merge pull request #2877 from alvistack/master-linux-amd64
Update nix pin with `make nixpkgs`
2021-01-10 05:01:38 -05:00
Wong Hoi Sing Edison
104e21e036 Update nix pin with make nixpkgs
Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
2021-01-10 11:43:10 +08:00
OpenShift Merge Robot
911e6ea15c Merge pull request #2897 from TomSweeneyRedHat/bump-1.19.0
Bump 1.19.0
2021-01-09 07:18:42 -05:00
TomSweeneyRedHat
4f7c609f67 Bump to v1.20.0-dev
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2021-01-08 14:35:43 -05:00
TomSweeneyRedHat
474febf0dc Bump to v1.19.0
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
v1.19.0
2021-01-08 14:30:59 -05:00
OpenShift Merge Robot
1b3dc91924 Merge pull request #2896 from rhatdan/VENDOR
Update vendor of containers/storage and containers/common
2021-01-08 10:32:32 -05:00
Daniel J Walsh
50a92faef6 Update vendor of containers/storage and containers/common
Preparing for buildah v1.19 we want to make sure we have the latest
containers code.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-08 09:23:24 -05:00
OpenShift Merge Robot
10c10eedd2 Merge pull request #2895 from rhatdan/push
Make buildah push support pushing manifests lists and digests
2021-01-08 08:44:41 -05:00
OpenShift Merge Robot
1b9ee76144 Merge pull request #2869 from rhatdan/bud
Add support for --manifest option in buildah bud and buildah commit
2021-01-08 08:37:12 -05:00
OpenShift Merge Robot
ddcbb30e8f Merge pull request #2894 from rhatdan/inspect
Buildah inspect should be able to inspect manifests
2021-01-08 08:31:02 -05:00
Daniel J Walsh
801da25a6e Buildah inspect should be able to inspect manifests
When you create a manifest or pull a manifest, it shows up
inside of the buildah images list.  When you go to inspect it
the inspect code blows up with a cryptic error message.

This patch fixes this problem and just uses the buildah manifest inspect
code.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-08 06:38:08 -05:00
OpenShift Merge Robot
6d3b8d3e10 Merge pull request #2893 from rhatdan/tmpdir
Fix handling of TMPDIR environment variable
2021-01-08 06:37:20 -05:00
Daniel J Walsh
57dde8e977 Make buildah push support pushing manifests lists and digests
Currently manifests just look like images in container storage.
It is surprising to the user when they go to push the images
that they end up failing, and have to use the buildah manifest push.

This patch causes buildah push to failover to buildah manifest push
if the image is a manifest.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-08 06:36:11 -05:00
Daniel J Walsh
c8f8b66bf7 Fix handling of TMPDIR environment variable
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1900822

Currently we are not passing the TMPDIR to the destination context
so when copying to containers storage we always fall back to /var/tmp.

This change sets the destination to match the source, so we can better
handle the storage.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-07 16:14:05 -05:00
Daniel J Walsh
7acdfe8e8d Add support for --manifest flags
This patch allows users to build a multi arch image with simple commands
using emulation software.

```
buildah bud --arch arm --manifest myimage /tmp/mysrc
buildah bud --arch amd64 --manifest myimage /tmp/mysrc
buildah bud --arch s390x --manifest myimage /tmp/mysrc
```

And something like this for buildah commit
```
build() {
	ctr=$(./bin/buildah from --arch $1 ubi8)
	./bin/buildah run $ctr dnf install -y iputils
	./bin/buildah commit --manifest ubi8ping $ctr
}
build arm
build amd64
build s390x
```

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-07 14:41:02 -05:00
OpenShift Merge Robot
f01ddd6800 Merge pull request #2883 from rhatdan/overlay
Upper directory should match mode of destination directory
2021-01-07 06:34:34 -05:00
OpenShift Merge Robot
02b914b1c4 Merge pull request #2868 from rhatdan/override
Use --arch and --os options to select architecture and os
2021-01-06 14:45:04 -05:00
Daniel J Walsh
84a261dd10 Upper directory should match mode of destination directory
When we mount over a destination directory inside of the container
we need to preserve the mode of the destination.

Needed to fix: https://github.com/containers/podman/issues/8801

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-06 14:44:38 -05:00
Daniel J Walsh
47e4c3ce50 Only grab the OS, Arch if the user actually specified them
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-06 06:44:39 -05:00
Daniel J Walsh
7d9b57e9e1 Use --arch and --os and --variant options to select architecture and os
Remove --override-os and --override-arch flags.

Also use --platform option if specified when generating the SystemContext.
Conflict --platform option with --os, --arch and --variant options.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2021-01-06 06:43:13 -05:00