Skip to content

Commit 7290112

Browse files
rhatdanrhatdan
authored
Merge branch 'main' into cp-follow-link
2 parents 07cefb9 + 03cd135 commit 7290112

File tree

325 files changed

+5781
-3495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+5781
-3495
lines changed

‎.cirrus.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ env:
3232
DEBIAN_NAME: "debian-12"
3333

3434
# Image identifiers
35-
IMAGE_SUFFIX: "c20230330t153101z-f37f36d12"
35+
IMAGE_SUFFIX: "c20230405t152256z-f37f36d12"
3636
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
3737
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
3838
DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}"
@@ -83,9 +83,9 @@ meta_task:
8383
GCPJSON: ENCRYPTED[d3614d6f5cc0e66be89d4252b3365fd84f14eee0259d4eb47e25fc0bc2842c7937f5ee8c882b7e547b4c5ec4b6733b14]
8484
GCPNAME: ENCRYPTED[8509e6a681b859479ce6aa275bd3c4ac82de5beec6df6057925afc4cd85b7ef2e879066ae8baaa2d453b82958e434578]
8585
GCPPROJECT: ENCRYPTED[cc09b62d0ec6746a3df685e663ad25d9d5af95ef5fd843c96f3d0ec9d7f065dc63216b9c685c9f43a776a1d403991494]
86-
CIRRUS_CLONE_DEPTH: 1 # source not used
8786

88-
script: '/usr/local/bin/entrypoint.sh |& ${_TIMESTAMP}'
87+
clone_script: 'true'
88+
script: '/usr/local/bin/entrypoint.sh'
8989

9090

9191
smoke_task:
@@ -192,7 +192,7 @@ conformance_task:
192192
gce_instance:
193193
image_name: "${DEBIAN_CACHE_IMAGE_NAME}"
194194

195-
timeout_in: 25m
195+
timeout_in: 65m
196196

197197
matrix:
198198
- env:

‎.github/renovate.json5

+7-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@
5353
// Don't leave dep. update. PRs "hanging", assign them to people.
5454
"assignees": ["containers/buildah-maintainers"],
5555

56-
/*************************************************
57-
***** Golang-specific configuration options *****
58-
*************************************************/
56+
"ignorePaths": [
57+
"**/vendor/**",
58+
"**/docs/**",
59+
"**/examples/**",
60+
"**/tests/tools/vendor/**"
61+
],
62+
5963
}

‎CHANGELOG.md

+73
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,79 @@
22

33
# Changelog
44

5+
## v1.30.0 (2023-04-06)
6+
7+
fix(deps): update module github.com/opencontainers/runc to v1.1.5
8+
fix(deps): update module github.com/fsouza/go-dockerclient to v1.9.7
9+
buildah image should not enable fuse-overlayfs for rootful mode
10+
stage_executor: inline network add default string
11+
fix(deps): update module github.com/containers/common to v0.51.2
12+
chore(deps): update dependency containers/automation_images to v20230330
13+
fix(deps): update module github.com/docker/docker to v23.0.2+incompatible
14+
chore(deps): update dependency containers/automation_images to v20230320
15+
fix(deps): update module github.com/onsi/gomega to v1.27.6
16+
fix(deps): update github.com/opencontainers/runtime-tools digest to e931285
17+
[skip-ci] Update actions/stale action to v8
18+
test: don't allow to override io.buildah.version
19+
executor: only apply label on the final stage
20+
Update docs/buildah-build.1.md
21+
update build instruction for Ubuntu
22+
code review
23+
build: accept arguments from file with --build-arg-file
24+
run_linux: Update heuristic for mounting /sys
25+
[CI:BUILD] Packit: Enable Copr builds on PR and commit to main
26+
fix(deps): update module github.com/fsouza/go-dockerclient to v1.9.6
27+
Update to Go 1.18
28+
Disable dependabot in favor of renovate
29+
chore(deps): update dependency containers/automation_images to v20230314
30+
Fix requiring tests on Makefile changes
31+
Vendor in latest containers/(storage, common, image)
32+
imagebuildah: set len(short_image_id) to 12
33+
Re-enable conformance tests
34+
Skip conformance test failures with Docker 23.0.1
35+
Cirrus: Replace Ubuntu -> Debian SID
36+
run: add support for inline --network in RUN stmt
37+
vendor: bump imagebuilder to a3c3f8358ca31b1e4daa6
38+
stage_executor: attempt to push cache only when cacheKey is valid
39+
Add "ifnewer" as option in help message for pull command
40+
build: document behaviour of buildah's distributed cache
41+
fix(deps): update module golang.org/x/term to v0.6.0
42+
Add default list of capabilities required to run buildah in a container
43+
executor,copy: honor default ARG value while eval stage
44+
sshagent: use ExtendedAgent instead of Agent
45+
tests/bud: remove unwated test
46+
executor: do not warn on builtin default args
47+
executor: don't warn about unused TARGETARCH,TARGETOS,TARGETPLATFORM
48+
Fix tutorial for rootless mode
49+
Vendor in latest containers/(common, storage, image)
50+
Ignore the base image's base image annotations
51+
fix(deps): update module github.com/fsouza/go-dockerclient to v1.9.5
52+
build(deps): bump github.com/containers/storage from 1.45.3 to 1.45.4
53+
Vendor in latest containers/common
54+
docs/tutorials/04: add defaults for Run()
55+
imagebuildah.StageExecutor: suppress bogus "Pushing cache []:..."
56+
executor: also add stage with no children to cleanupStages
57+
[CI:BUILD] copr: fix el8 builds
58+
Fix documentation on which Capabilities are allowed by default
59+
Skip subject-length validation for renovate PRs
60+
Temporarily hard-skip bud-multiple-platform-values test
61+
fix(deps): update github.com/openshift/imagebuilder digest to 86828bf
62+
build(deps): bump github.com/containerd/containerd from 1.6.16 to 1.6.17
63+
build(deps): bump tim-actions/get-pr-commits from 1.1.0 to 1.2.0
64+
build(deps): bump github.com/containers/image/v5 from 5.24.0 to 5.24.1
65+
[skip-ci] Update tim-actions/get-pr-commits digest to 55b867b
66+
build(deps): bump github.com/opencontainers/selinux
67+
build(deps): bump golang.org/x/crypto from 0.5.0 to 0.6.0
68+
Add renovate configuration
69+
Run codespell on codebase
70+
login: support interspersed args for password
71+
conformance: use scratch for minimal test
72+
pkg/parse: expose public CleanCacheMount API
73+
build(deps): bump go.etcd.io/bbolt from 1.3.6 to 1.3.7
74+
build(deps): bump github.com/containerd/containerd from 1.6.15 to 1.6.16
75+
docs: specify order preference for FROM
76+
Bump to v1.30.0-dev
77+
578
## v1.29.0 (2023-01-25)
679

780
tests: improve build-with-network-test

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ install.runc:
167167

168168
.PHONY: test-conformance
169169
test-conformance:
170-
$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover -timeout 20m ./tests/conformance
170+
$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover -timeout 60m ./tests/conformance
171171

172172
.PHONY: test-integration
173173
test-integration: install.tools

‎changelog.txt

+72
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,75 @@
1+
- Changelog for v1.30.0 (2023-04-06)
2+
* fix(deps): update module github.com/opencontainers/runc to v1.1.5
3+
* fix(deps): update module github.com/fsouza/go-dockerclient to v1.9.7
4+
* buildah image should not enable fuse-overlayfs for rootful mode
5+
* stage_executor: inline network add default string
6+
* fix(deps): update module github.com/containers/common to v0.51.2
7+
* chore(deps): update dependency containers/automation_images to v20230330
8+
* fix(deps): update module github.com/docker/docker to v23.0.2+incompatible
9+
* chore(deps): update dependency containers/automation_images to v20230320
10+
* fix(deps): update module github.com/onsi/gomega to v1.27.6
11+
* fix(deps): update github.com/opencontainers/runtime-tools digest to e931285
12+
* [skip-ci] Update actions/stale action to v8
13+
* test: don't allow to override io.buildah.version
14+
* executor: only apply label on the final stage
15+
* Update docs/buildah-build.1.md
16+
* update build instruction for Ubuntu
17+
* code review
18+
* build: accept arguments from file with --build-arg-file
19+
* run_linux: Update heuristic for mounting /sys
20+
* [CI:BUILD] Packit: Enable Copr builds on PR and commit to main
21+
* fix(deps): update module github.com/fsouza/go-dockerclient to v1.9.6
22+
* Update to Go 1.18
23+
* Disable dependabot in favor of renovate
24+
* chore(deps): update dependency containers/automation_images to v20230314
25+
* Fix requiring tests on Makefile changes
26+
* Vendor in latest containers/(storage, common, image)
27+
* imagebuildah: set len(short_image_id) to 12
28+
* Re-enable conformance tests
29+
* Skip conformance test failures with Docker 23.0.1
30+
* Cirrus: Replace Ubuntu -> Debian SID
31+
* run: add support for inline --network in RUN stmt
32+
* vendor: bump imagebuilder to a3c3f8358ca31b1e4daa6
33+
* stage_executor: attempt to push cache only when cacheKey is valid
34+
* Add "ifnewer" as option in help message for pull command
35+
* build: document behaviour of buildah's distributed cache
36+
* fix(deps): update module golang.org/x/term to v0.6.0
37+
* Add default list of capabilities required to run buildah in a container
38+
* executor,copy: honor default ARG value while eval stage
39+
* sshagent: use ExtendedAgent instead of Agent
40+
* tests/bud: remove unwated test
41+
* executor: do not warn on builtin default args
42+
* executor: don't warn about unused TARGETARCH,TARGETOS,TARGETPLATFORM
43+
* Fix tutorial for rootless mode
44+
* Vendor in latest containers/(common, storage, image)
45+
* Ignore the base image's base image annotations
46+
* fix(deps): update module github.com/fsouza/go-dockerclient to v1.9.5
47+
* build(deps): bump github.com/containers/storage from 1.45.3 to 1.45.4
48+
* Vendor in latest containers/common
49+
* docs/tutorials/04: add defaults for Run()
50+
* imagebuildah.StageExecutor: suppress bogus "Pushing cache []:..."
51+
* executor: also add stage with no children to cleanupStages
52+
* [CI:BUILD] copr: fix el8 builds
53+
* Fix documentation on which Capabilities are allowed by default
54+
* Skip subject-length validation for renovate PRs
55+
* Temporarily hard-skip bud-multiple-platform-values test
56+
* fix(deps): update github.com/openshift/imagebuilder digest to 86828bf
57+
* build(deps): bump github.com/containerd/containerd from 1.6.16 to 1.6.17
58+
* build(deps): bump tim-actions/get-pr-commits from 1.1.0 to 1.2.0
59+
* build(deps): bump github.com/containers/image/v5 from 5.24.0 to 5.24.1
60+
* [skip-ci] Update tim-actions/get-pr-commits digest to 55b867b
61+
* build(deps): bump github.com/opencontainers/selinux
62+
* build(deps): bump golang.org/x/crypto from 0.5.0 to 0.6.0
63+
* Add renovate configuration
64+
* Run codespell on codebase
65+
* login: support interspersed args for password
66+
* conformance: use scratch for minimal test
67+
* pkg/parse: expose public CleanCacheMount API
68+
* build(deps): bump go.etcd.io/bbolt from 1.3.6 to 1.3.7
69+
* build(deps): bump github.com/containerd/containerd from 1.6.15 to 1.6.16
70+
* docs: specify order preference for FROM
71+
* Bump to v1.30.0-dev
72+
173
- Changelog for v1.29.0 (2023-01-25)
274
* tests: improve build-with-network-test
375
* Bump c/storagev1.45.3, c/imagev5.24.0, c/commonv0.51.0

‎cmd/buildah/manifest.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func init() {
210210
return manifestPushCmd(cmd, args, manifestPushOpts)
211211
},
212212
Example: `buildah manifest push mylist:v1.11 transport:imageName`,
213-
Args: cobra.MinimumNArgs(2),
213+
Args: cobra.MinimumNArgs(1),
214214
}
215215
manifestPushCommand.SetUsageTemplate(UsageTemplate())
216216
flags = manifestPushCommand.Flags()
@@ -830,20 +830,20 @@ func manifestPushCmd(c *cobra.Command, args []string, opts pushOptions) error {
830830
case 0:
831831
return errors.New("At least a source list ID must be specified")
832832
case 1:
833-
return errors.New("Two arguments are necessary to push: source and destination")
833+
listImageSpec = args[0]
834+
destSpec = "docker://"+listImageSpec
834835
case 2:
835836
listImageSpec = args[0]
836837
destSpec = args[1]
837-
if listImageSpec == "" {
838-
return fmt.Errorf(`invalid image name "%s"`, listImageSpec)
839-
}
840-
if destSpec == "" {
841-
return fmt.Errorf(`invalid image name "%s"`, destSpec)
842-
}
843838
default:
844839
return errors.New("Only two arguments are necessary to push: source and destination")
845840
}
846-
841+
if listImageSpec == "" {
842+
return fmt.Errorf(`invalid image name "%s"`, listImageSpec)
843+
}
844+
if destSpec == "" {
845+
return fmt.Errorf(`invalid image name "%s"`, destSpec)
846+
}
847847
store, err := getStore(c)
848848
if err != nil {
849849
return err

‎cmd/buildah/run.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ func runCmd(c *cobra.Command, args []string, iopts runInputOptions) error {
152152
CNIConfigDir: iopts.CNIConfigDir,
153153
AddCapabilities: iopts.capAdd,
154154
DropCapabilities: iopts.capDrop,
155-
Env: iopts.env,
156155
WorkingDir: iopts.workingDir,
157156
}
158157

@@ -164,6 +163,8 @@ func runCmd(c *cobra.Command, args []string, iopts runInputOptions) error {
164163
}
165164
}
166165

166+
options.Env = buildahcli.LookupEnvVarReferences(iopts.env, os.Environ())
167+
167168
systemContext, err := parse.SystemContextFromOptions(c)
168169
if err != nil {
169170
return fmt.Errorf("building system context: %w", err)

‎define/types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const (
2929
// identify working containers.
3030
Package = "buildah"
3131
// Version for the Package. Also used by .packit.sh for Packit builds.
32-
Version = "1.30.0-dev"
32+
Version = "1.31.0-dev"
3333

3434
// DefaultRuntime if containers.conf fails.
3535
DefaultRuntime = "runc"

‎docs/buildah-build.1.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ process.
608608

609609
Set the OS/ARCH of the built image (and its base image, if your build uses one)
610610
to the provided value instead of using the current operating system and
611-
architecture of the host (for example `linux/arm`).
611+
architecture of the host (for example `linux/arm`, `linux/arm64`, `linux/amd64`).
612612

613613
The `--platform` flag can be specified more than once, or given a
614614
comma-separated list of values as its argument. When more than one platform is
@@ -621,9 +621,7 @@ the `arch` command. Valid OS and architecture name combinations are listed as
621621
values for $GOOS and $GOARCH at https://golang.org/doc/install/source#environment,
622622
and can also be found by running `go tool dist list`.
623623

624-
While `buildah bud` is happy to use base images and build images for any
625-
platform that exists, `RUN` instructions will not be able to succeed without
626-
the help of emulation provided by packages like `qemu-user-static`.
624+
The `buildah build` command allows building images for all Linux architectures, even non-native architectures. When building images for a different architecture, the `RUN` instructions require emulation software installed on the host provided by packages like `qemu-user-static`. Note: it is always preferred to build images on the native architecture if possible.
627625

628626
**NOTE:** The `--platform` option may not be used in combination with the `--arch`, `--os`, or `--variant` options.
629627

@@ -1084,7 +1082,7 @@ buildah build --arch s390x --manifest myimage /tmp/mysrc
10841082

10851083
buildah bud --platform linux/s390x,linux/ppc64le,linux/amd64 --manifest myimage /tmp/mysrc
10861084

1087-
buildah bud --platform linux/arm64 --platform linux/amd64 --manifest myimage /tmp/mysrc
1085+
buildah build --platform linux/arm64 --platform linux/amd64 --manifest myimage /tmp/mysrc
10881086

10891087
buildah bud --all-platforms --manifest myimage /tmp/mysrc
10901088

0 commit comments

Comments
 (0)