opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 01:19:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8202 from TomSweeneyRedHat/dev/tsweeney/buildahv1.17.0

Browse Source 
Bump Buildah to v1.17.0
This commit is contained in:
OpenShift Merge Robot
2020-10-30 20:27:53 +01:00
committed by GitHub
parent 1fe79dd677 acba9d5c01
commit d475c99b5b
7 changed files with 217 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -10,7 +10,7 @@ require (
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
github.com/containernetworking/cni v0.8.0
github.com/containernetworking/plugins v0.8.7
github.com/containers/buildah v1.16.5
github.com/containers/buildah v1.17.0
github.com/containers/common v0.26.3
github.com/containers/conmon v2.0.20+incompatible
github.com/containers/image/v5 v5.7.0
@ -72,5 +72,3 @@ require (
k8s.io/apimachinery v0.19.3
k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
)
replace github.com/containers/buildah => github.com/containers/buildah v1.16.1-0.20201028193114-3ac12986e8cf

4
go.sum
View File

@ -83,8 +83,8 @@ github.com/containernetworking/cni v0.8.0 h1:BT9lpgGoH4jw3lFC7Odz2prU5ruiYKcgAjM
github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
github.com/containernetworking/plugins v0.8.7 h1:bU7QieuAp+sACI2vCzESJ3FoT860urYP+lThyZkb/2M=
github.com/containernetworking/plugins v0.8.7/go.mod h1:R7lXeZaBzpfqapcAbHRW8/CYwm0dHzbz0XEjofx0uB0=
github.com/containers/buildah v1.16.1-0.20201028193114-3ac12986e8cf h1:dFKJs8H7MAXnHTmzBjGDgRuyzLBnHitYNFLPcAuyW/E=
github.com/containers/buildah v1.16.1-0.20201028193114-3ac12986e8cf/go.mod h1:E6nOiMnF3uCAY3wAQK5lPR6w89SRp8iyIkjUfDKW+Eg=
github.com/containers/buildah v1.17.0 h1:oaBIxKtW4kJ06vj4l0C9MZfFVapksf6F4qdQGOvZ2J4=
github.com/containers/buildah v1.17.0/go.mod h1:E6nOiMnF3uCAY3wAQK5lPR6w89SRp8iyIkjUfDKW+Eg=
github.com/containers/common v0.26.2/go.mod h1:igUeog5hx8rYhJk67rG6rGAh3zEcf0Uxuzm9KpXzo2E=
github.com/containers/common v0.26.3 h1:5Kb5fMmJ7/xMiJ+iEbPA+5pQpl/FGxCgJex4nml4Slo=
github.com/containers/common v0.26.3/go.mod h1:hJWZIlrl5MsE2ELNRa+MPp6I1kPbXHauuj0Ym4BsLG4=

90
vendor/github.com/containers/buildah/CHANGELOG.md generated vendored
View File

@ -2,6 +2,96 @@
# Changelog
## v1.17.0 (2020-10-29)
Handle cases where other tools mount/unmount containers
overlay.MountReadOnly: support RO overlay mounts
overlay: use fusermount for rootless umounts
overlay: fix umount
Switch default log level of Buildah to Warn. Users need to see these messages
Drop error messages about OCI/Docker format to Warning level
build(deps): bump github.com/containers/common from 0.26.0 to 0.26.2
tests/testreport: adjust for API break in storage v1.23.6
build(deps): bump github.com/containers/storage from 1.23.5 to 1.23.7
build(deps): bump github.com/fsouza/go-dockerclient from 1.6.5 to 1.6.6
copier: put: ignore Typeflag="g"
Use curl to get repo file (fix #2714)
build(deps): bump github.com/containers/common from 0.25.0 to 0.26.0
build(deps): bump github.com/spf13/cobra from 1.0.0 to 1.1.1
Remove docs that refer to bors, since we're not using it
Buildah bud should not use stdin by default
bump containerd, docker, and golang.org/x/sys
Makefile: cross: remove windows.386 target
copier.copierHandlerPut: don't check length when there are errors
Stop excessive wrapping
CI: require that conformance tests pass
bump(github.com/openshift/imagebuilder) to v1.1.8
Skip tlsVerify insecure BUILD_REGISTRY_SOURCES
Fix build path wrong https://github.com/containers/podman/issues/7993
refactor pullpolicy to avoid deps
build(deps): bump github.com/containers/common from 0.24.0 to 0.25.0
CI: run gating tasks with a lot more memory
ADD and COPY: descend into excluded directories, sometimes
copier: add more context to a couple of error messages
copier: check an error earlier
copier: log stderr output as debug on success
Update nix pin with `make nixpkgs`
Set directory ownership when copied with ID mapping
build(deps): bump github.com/sirupsen/logrus from 1.6.0 to 1.7.0
build(deps): bump github.com/containers/common from 0.23.0 to 0.24.0
Cirrus: Remove bors artifacts
Sort build flag definitions alphabetically
ADD: only expand archives at the right time
Remove configuration for bors
Shell Completion for podman build flags
Bump c/common to v0.24.0
New CI check: xref --help vs man pages
CI: re-enable several linters
Move --userns-uid-map/--userns-gid-map description into buildah man page
add: preserve ownerships and permissions on ADDed archives
Makefile: tweak the cross-compile target
Bump containers/common to v0.23.0
chroot: create bind mount targets 0755 instead of 0700
Change call to Split() to safer SplitN()
chroot: fix handling of errno seccomp rules
build(deps): bump github.com/containers/image/v5 from 5.5.2 to 5.6.0
Add In Progress section to contributing
integration tests: make sure tests run in ${topdir}/tests
Run(): ignore containers.conf's environment configuration
Warn when setting healthcheck in OCI format
Cirrus: Skip git-validate on branches
tools: update git-validation to the latest commit
tools: update golangci-lint to v1.18.0
Add a few tests of push command
Add(): fix handling of relative paths with no ContextDir
build(deps): bump github.com/containers/common from 0.21.0 to 0.22.0
Lint: Use same linters as podman
Validate: reference HEAD
Fix buildah mount to display container names not ids
Update nix pin with `make nixpkgs`
Add missing --format option in buildah from man page
Fix up code based on codespell
build(deps): bump github.com/openshift/imagebuilder from 1.1.6 to 1.1.7
build(deps): bump github.com/containers/storage from 1.23.4 to 1.23.5
Improve buildah completions
Cirrus: Fix validate commit epoch
Fix bash completion of manifest flags
Uniform some man pages
Update Buildah Tutorial to address BZ1867426
Update bash completion of `manifest add` sub command
copier.Get(): hard link targets shouldn't be relative paths
build(deps): bump github.com/onsi/gomega from 1.10.1 to 1.10.2
Pass timestamp down to history lines
Timestamp gets updated everytime you inspect an image
bud.bats: use absolute paths in newly-added tests
contrib/cirrus/lib.sh: don't use CN for the hostname
tests: Add some tests
Update `manifest add` man page
Extend flags of `manifest add`
build(deps): bump github.com/containers/storage from 1.23.3 to 1.23.4
build(deps): bump github.com/onsi/ginkgo from 1.14.0 to 1.14.1
Bump to v1.17.0-dev
CI: expand cross-compile checks
## v1.16.0 (2020-09-03)
fix build on 32bit arches
containerImageRef.NewImageSource(): don't always force timestamps

2
vendor/github.com/containers/buildah/buildah.go generated vendored
View File

@ -28,7 +28,7 @@ const (
Package = "buildah"
// Version for the Package. Bump version in contrib/rpm/buildah.spec
// too.
Version = "1.17.0-dev"
Version = "1.17.0"
// The value we use to identify what type of information, currently a
// serialized Builder structure, we are using as per-container state.
// This should only be changed when we make incompatible changes to

90
vendor/github.com/containers/buildah/changelog.txt generated vendored
View File

@ -1,3 +1,93 @@
- Changelog for v1.17.0 (2020-10-29)
* Handle cases where other tools mount/unmount containers
* overlay.MountReadOnly: support RO overlay mounts
* overlay: use fusermount for rootless umounts
* overlay: fix umount
* Switch default log level of Buildah to Warn. Users need to see these messages
* Drop error messages about OCI/Docker format to Warning level
* build(deps): bump github.com/containers/common from 0.26.0 to 0.26.2
* tests/testreport: adjust for API break in storage v1.23.6
* build(deps): bump github.com/containers/storage from 1.23.5 to 1.23.7
* build(deps): bump github.com/fsouza/go-dockerclient from 1.6.5 to 1.6.6
* copier: put: ignore Typeflag="g"
* Use curl to get repo file (fix #2714)
* build(deps): bump github.com/containers/common from 0.25.0 to 0.26.0
* build(deps): bump github.com/spf13/cobra from 1.0.0 to 1.1.1
* Remove docs that refer to bors, since we're not using it
* Buildah bud should not use stdin by default
* bump containerd, docker, and golang.org/x/sys
* Makefile: cross: remove windows.386 target
* copier.copierHandlerPut: don't check length when there are errors
* Stop excessive wrapping
* CI: require that conformance tests pass
* bump(github.com/openshift/imagebuilder) to v1.1.8
* Skip tlsVerify insecure BUILD_REGISTRY_SOURCES
* Fix build path wrong https://github.com/containers/podman/issues/7993
* refactor pullpolicy to avoid deps
* build(deps): bump github.com/containers/common from 0.24.0 to 0.25.0
* CI: run gating tasks with a lot more memory
* ADD and COPY: descend into excluded directories, sometimes
* copier: add more context to a couple of error messages
* copier: check an error earlier
* copier: log stderr output as debug on success
* Update nix pin with `make nixpkgs`
* Set directory ownership when copied with ID mapping
* build(deps): bump github.com/sirupsen/logrus from 1.6.0 to 1.7.0
* build(deps): bump github.com/containers/common from 0.23.0 to 0.24.0
* Cirrus: Remove bors artifacts
* Sort build flag definitions alphabetically
* ADD: only expand archives at the right time
* Remove configuration for bors
* Shell Completion for podman build flags
* Bump c/common to v0.24.0
* New CI check: xref --help vs man pages
* CI: re-enable several linters
* Move --userns-uid-map/--userns-gid-map description into buildah man page
* add: preserve ownerships and permissions on ADDed archives
* Makefile: tweak the cross-compile target
* Bump containers/common to v0.23.0
* chroot: create bind mount targets 0755 instead of 0700
* Change call to Split() to safer SplitN()
* chroot: fix handling of errno seccomp rules
* build(deps): bump github.com/containers/image/v5 from 5.5.2 to 5.6.0
* Add In Progress section to contributing
* integration tests: make sure tests run in ${topdir}/tests
* Run(): ignore containers.conf's environment configuration
* Warn when setting healthcheck in OCI format
* Cirrus: Skip git-validate on branches
* tools: update git-validation to the latest commit
* tools: update golangci-lint to v1.18.0
* Add a few tests of push command
* Add(): fix handling of relative paths with no ContextDir
* build(deps): bump github.com/containers/common from 0.21.0 to 0.22.0
* Lint: Use same linters as podman
* Validate: reference HEAD
* Fix buildah mount to display container names not ids
* Update nix pin with `make nixpkgs`
* Add missing --format option in buildah from man page
* Fix up code based on codespell
* build(deps): bump github.com/openshift/imagebuilder from 1.1.6 to 1.1.7
* build(deps): bump github.com/containers/storage from 1.23.4 to 1.23.5
* Improve buildah completions
* Cirrus: Fix validate commit epoch
* Fix bash completion of manifest flags
* Uniform some man pages
* Update Buildah Tutorial to address BZ1867426
* Update bash completion of `manifest add` sub command
* copier.Get(): hard link targets shouldn't be relative paths
* build(deps): bump github.com/onsi/gomega from 1.10.1 to 1.10.2
* Pass timestamp down to history lines
* Timestamp gets updated everytime you inspect an image
* bud.bats: use absolute paths in newly-added tests
* contrib/cirrus/lib.sh: don't use CN for the hostname
* tests: Add some tests
* Update `manifest add` man page
* Extend flags of `manifest add`
* build(deps): bump github.com/containers/storage from 1.23.3 to 1.23.4
* build(deps): bump github.com/onsi/ginkgo from 1.14.0 to 1.14.1
* Bump to v1.17.0-dev
* CI: expand cross-compile checks
- Changelog for v1.16.0 (2020-09-03)
* fix build on 32bit arches
* containerImageRef.NewImageSource(): don't always force timestamps

32
vendor/github.com/containers/buildah/mount.go generated vendored
View File

@ -19,3 +19,35 @@ func (b *Builder) Mount(label string) (string, error) {
}
return mountpoint, nil
}
func (b *Builder) setMountPoint(mountPoint string) error {
b.MountPoint = mountPoint
if err := b.Save(); err != nil {
return errors.Wrapf(err, "error saving updated state for build container %q", b.ContainerID)
}
return nil
}
// Mounted returns whether the container is mounted or not
func (b *Builder) Mounted() (bool, error) {
mountCnt, err := b.store.Mounted(b.ContainerID)
if err != nil {
return false, errors.Wrapf(err, "error determining if mounting build container %q is mounted", b.ContainerID)
}
mounted := mountCnt > 0
if mounted && b.MountPoint == "" {
ctr, err := b.store.Container(b.ContainerID)
if err != nil {
return mountCnt > 0, errors.Wrapf(err, "error determining if mounting build container %q is mounted", b.ContainerID)
}
layer, err := b.store.Layer(ctr.LayerID)
if err != nil {
return mountCnt > 0, errors.Wrapf(err, "error determining if mounting build container %q is mounted", b.ContainerID)
}
return mounted, b.setMountPoint(layer.MountPoint)
}
if !mounted && b.MountPoint != "" {
return mounted, b.setMountPoint("")
}
return mounted, nil
}

2
vendor/modules.txt vendored
View File

@ -66,7 +66,7 @@ github.com/containernetworking/plugins/pkg/utils/hwaddr
github.com/containernetworking/plugins/pkg/utils/sysctl
github.com/containernetworking/plugins/plugins/ipam/host-local/backend
github.com/containernetworking/plugins/plugins/ipam/host-local/backend/allocator
# github.com/containers/buildah v1.16.5 => github.com/containers/buildah v1.16.1-0.20201028193114-3ac12986e8cf
# github.com/containers/buildah v1.17.0
github.com/containers/buildah
github.com/containers/buildah/bind
github.com/containers/buildah/chroot