Merge branch 'main' into cp-follow-link

.cirrus.yml

@@ -32,7 +32,7 @@ env:
     DEBIAN_NAME: "debian-12"
 
     # Image identifiers
-    IMAGE_SUFFIX: "c20230330t153101z-f37f36d12"
+    IMAGE_SUFFIX: "c20230405t152256z-f37f36d12"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
     PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
     DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}"
@@ -83,9 +83,9 @@ meta_task:
         GCPJSON: ENCRYPTED[d3614d6f5cc0e66be89d4252b3365fd84f14eee0259d4eb47e25fc0bc2842c7937f5ee8c882b7e547b4c5ec4b6733b14]
         GCPNAME: ENCRYPTED[8509e6a681b859479ce6aa275bd3c4ac82de5beec6df6057925afc4cd85b7ef2e879066ae8baaa2d453b82958e434578]
         GCPPROJECT: ENCRYPTED[cc09b62d0ec6746a3df685e663ad25d9d5af95ef5fd843c96f3d0ec9d7f065dc63216b9c685c9f43a776a1d403991494]
-        CIRRUS_CLONE_DEPTH: 1  # source not used
 
-    script: '/usr/local/bin/entrypoint.sh |& ${_TIMESTAMP}'
+    clone_script: 'true'
+    script: '/usr/local/bin/entrypoint.sh'
 
 
 smoke_task:
@@ -192,7 +192,7 @@ conformance_task:
     gce_instance:
         image_name: "${DEBIAN_CACHE_IMAGE_NAME}"
 
-    timeout_in: 25m
+    timeout_in: 65m
 
     matrix:
         - env:

.github/renovate.json5

@@ -53,7 +53,11 @@
   // Don't leave dep. update. PRs "hanging", assign them to people.
   "assignees": ["containers/buildah-maintainers"],
 
-  /*************************************************
-   ***** Golang-specific configuration options *****
-   *************************************************/
+  "ignorePaths": [
+    "**/vendor/**",
+    "**/docs/**",
+    "**/examples/**",
+    "**/tests/tools/vendor/**"
+  ],
+
 }

CHANGELOG.md

@@ -2,6 +2,79 @@
 
 # Changelog
 
+## v1.30.0 (2023-04-06)
+
+    fix(deps): update module github.com/opencontainers/runc to v1.1.5
+    fix(deps): update module github.com/fsouza/go-dockerclient to v1.9.7
+    buildah image should not enable fuse-overlayfs for rootful mode
+    stage_executor: inline network add default string
+    fix(deps): update module github.com/containers/common to v0.51.2
+    chore(deps): update dependency containers/automation_images to v20230330
+    fix(deps): update module github.com/docker/docker to v23.0.2+incompatible
+    chore(deps): update dependency containers/automation_images to v20230320
+    fix(deps): update module github.com/onsi/gomega to v1.27.6
+    fix(deps): update github.com/opencontainers/runtime-tools digest to e931285
+    [skip-ci] Update actions/stale action to v8
+    test: don't allow to override io.buildah.version
+    executor: only apply label on the final stage
+    Update docs/buildah-build.1.md
+    update build instruction for Ubuntu
+    code review
+    build: accept arguments from file with --build-arg-file
+    run_linux: Update heuristic for mounting /sys
+    [CI:BUILD] Packit: Enable Copr builds on PR and commit to main
+    fix(deps): update module github.com/fsouza/go-dockerclient to v1.9.6
+    Update to Go 1.18
+    Disable dependabot in favor of renovate
+    chore(deps): update dependency containers/automation_images to v20230314
+    Fix requiring tests on Makefile changes
+    Vendor in latest containers/(storage, common, image)
+    imagebuildah: set len(short_image_id) to 12
+    Re-enable conformance tests
+    Skip conformance test failures with Docker 23.0.1
+    Cirrus: Replace Ubuntu -> Debian SID
+    run: add support for inline --network in RUN stmt
+    vendor: bump imagebuilder to a3c3f8358ca31b1e4daa6
+    stage_executor: attempt to push cache only when cacheKey is valid
+    Add "ifnewer" as option in help message for pull command
+    build: document behaviour of buildah's distributed cache
+    fix(deps): update module golang.org/x/term to v0.6.0
+    Add default list of capabilities required to run buildah in a container
+    executor,copy: honor default ARG value while eval stage
+    sshagent: use ExtendedAgent instead of Agent
+    tests/bud: remove unwated test
+    executor: do not warn on builtin default args
+    executor: don't warn about unused TARGETARCH,TARGETOS,TARGETPLATFORM
+    Fix tutorial for rootless mode
+    Vendor in latest containers/(common, storage, image)
+    Ignore the base image's base image annotations
+    fix(deps): update module github.com/fsouza/go-dockerclient to v1.9.5
+    build(deps): bump github.com/containers/storage from 1.45.3 to 1.45.4
+    Vendor in latest containers/common
+    docs/tutorials/04: add defaults for Run()
+    imagebuildah.StageExecutor: suppress bogus "Pushing cache []:..."
+    executor: also add stage with no children to cleanupStages
+    [CI:BUILD] copr: fix el8 builds
+    Fix documentation on which Capabilities are allowed by default
+    Skip subject-length validation for renovate PRs
+    Temporarily hard-skip bud-multiple-platform-values test
+    fix(deps): update github.com/openshift/imagebuilder digest to 86828bf
+    build(deps): bump github.com/containerd/containerd from 1.6.16 to 1.6.17
+    build(deps): bump tim-actions/get-pr-commits from 1.1.0 to 1.2.0
+    build(deps): bump github.com/containers/image/v5 from 5.24.0 to 5.24.1
+    [skip-ci] Update tim-actions/get-pr-commits digest to 55b867b
+    build(deps): bump github.com/opencontainers/selinux
+    build(deps): bump golang.org/x/crypto from 0.5.0 to 0.6.0
+    Add renovate configuration
+    Run codespell on codebase
+    login: support interspersed args for password
+    conformance: use scratch for minimal test
+    pkg/parse: expose public CleanCacheMount API
+    build(deps): bump go.etcd.io/bbolt from 1.3.6 to 1.3.7
+    build(deps): bump github.com/containerd/containerd from 1.6.15 to 1.6.16
+    docs: specify order preference for FROM
+    Bump to v1.30.0-dev
+
 ## v1.29.0 (2023-01-25)
 
     tests: improve build-with-network-test

Makefile

@@ -167,7 +167,7 @@ install.runc:
 
 .PHONY: test-conformance
 test-conformance:
-	$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover -timeout 20m ./tests/conformance
+	$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover -timeout 60m ./tests/conformance
 
 .PHONY: test-integration
 test-integration: install.tools

changelog.txt

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

cmd/buildah/manifest.go

@@ -210,7 +210,7 @@ func init() {
 			return manifestPushCmd(cmd, args, manifestPushOpts)
 		},
 		Example: `buildah manifest push mylist:v1.11 transport:imageName`,
-		Args:    cobra.MinimumNArgs(2),
+		Args:    cobra.MinimumNArgs(1),
 	}
 	manifestPushCommand.SetUsageTemplate(UsageTemplate())
 	flags = manifestPushCommand.Flags()
@@ -830,20 +830,20 @@ func manifestPushCmd(c *cobra.Command, args []string, opts pushOptions) error {
 	case 0:
 		return errors.New("At least a source list ID must be specified")
 	case 1:
-		return errors.New("Two arguments are necessary to push: source and destination")
+		listImageSpec = args[0]
+		destSpec = "docker://"+listImageSpec
 	case 2:
 		listImageSpec = args[0]
 		destSpec = args[1]
-		if listImageSpec == "" {
-			return fmt.Errorf(`invalid image name "%s"`, listImageSpec)
-		}
-		if destSpec == "" {
-			return fmt.Errorf(`invalid image name "%s"`, destSpec)
-		}
 	default:
 		return errors.New("Only two arguments are necessary to push: source and destination")
 	}
-
+	if listImageSpec == "" {
+		return fmt.Errorf(`invalid image name "%s"`, listImageSpec)
+	}
+	if destSpec == "" {
+		return fmt.Errorf(`invalid image name "%s"`, destSpec)
+	}
 	store, err := getStore(c)
 	if err != nil {
 		return err

cmd/buildah/run.go

@@ -152,7 +152,6 @@ func runCmd(c *cobra.Command, args []string, iopts runInputOptions) error {
 		CNIConfigDir:     iopts.CNIConfigDir,
 		AddCapabilities:  iopts.capAdd,
 		DropCapabilities: iopts.capDrop,
-		Env:              iopts.env,
 		WorkingDir:       iopts.workingDir,
 	}
 
@@ -164,6 +163,8 @@ func runCmd(c *cobra.Command, args []string, iopts runInputOptions) error {
 		}
 	}
 
+	options.Env = buildahcli.LookupEnvVarReferences(iopts.env, os.Environ())
+
 	systemContext, err := parse.SystemContextFromOptions(c)
 	if err != nil {
 		return fmt.Errorf("building system context: %w", err)

define/types.go

@@ -29,7 +29,7 @@ const (
 	// identify working containers.
 	Package = "buildah"
 	// Version for the Package. Also used by .packit.sh for Packit builds.
-	Version = "1.30.0-dev"
+	Version = "1.31.0-dev"
 
 	// DefaultRuntime if containers.conf fails.
 	DefaultRuntime = "runc"

docs/buildah-build.1.md

@@ -608,7 +608,7 @@ process.
 
 Set the OS/ARCH of the built image (and its base image, if your build uses one)
 to the provided value instead of using the current operating system and
-architecture of the host (for example `linux/arm`).
+architecture of the host (for example `linux/arm`, `linux/arm64`, `linux/amd64`).
 
 The `--platform` flag can be specified more than once, or given a
 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
 values for $GOOS and $GOARCH at https://golang.org/doc/install/source#environment,
 and can also be found by running `go tool dist list`.
 
-While `buildah bud` is happy to use base images and build images for any
-platform that exists, `RUN` instructions will not be able to succeed without
-the help of emulation provided by packages like `qemu-user-static`.
+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.
 
 **NOTE:** The `--platform` option may not be used in combination with the `--arch`, `--os`, or `--variant` options.
 
@@ -1084,7 +1082,7 @@ buildah build --arch s390x --manifest myimage /tmp/mysrc
 
 buildah bud --platform linux/s390x,linux/ppc64le,linux/amd64 --manifest myimage /tmp/mysrc
 
-buildah bud --platform linux/arm64 --platform linux/amd64 --manifest myimage /tmp/mysrc
+buildah build --platform linux/arm64 --platform linux/amd64 --manifest myimage /tmp/mysrc
 
 buildah bud --all-platforms --manifest myimage /tmp/mysrc