Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package buildah for openSUSE:Factory checked in at 2021-02-22 14:41:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/buildah (Old) and /work/SRC/openSUSE:Factory/.buildah.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "buildah" Mon Feb 22 14:41:13 2021 rev:40 rq:874292 version:1.19.6 Changes: -------- --- /work/SRC/openSUSE:Factory/buildah/buildah.changes 2021-02-15 23:21:48.619889585 +0100 +++ /work/SRC/openSUSE:Factory/.buildah.new.2378/buildah.changes 2021-02-22 14:41:19.524681868 +0100 @@ -1,0 +2,13 @@ +Sat Feb 20 10:16:36 UTC 2021 - [email protected] + +- Update to version 1.19.6: + * Bump c/containers/storage v1.24.6 + * Don't fail copy to emptydir + * Workaround for RHEL gating test failure + * Fix config-flags-verification test on F33 + * Fix bud capabilities test + * Stop overriding the location of the blob info cache + * Fix caching layers with build args + * Vendor in latest containers/image and common + +------------------------------------------------------------------- Old: ---- buildah-1.19.4.tar.xz New: ---- buildah-1.19.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ buildah.spec ++++++ --- /var/tmp/diff_new_pack.BxEscj/_old 2021-02-22 14:41:20.116682525 +0100 +++ /var/tmp/diff_new_pack.BxEscj/_new 2021-02-22 14:41:20.120682529 +0100 @@ -22,7 +22,7 @@ %define with_libostree 1 %endif Name: buildah -Version: 1.19.4 +Version: 1.19.6 Release: 0 Summary: Tool for building OCI containers License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.BxEscj/_old 2021-02-22 14:41:20.152682565 +0100 +++ /var/tmp/diff_new_pack.BxEscj/_new 2021-02-22 14:41:20.152682565 +0100 @@ -5,7 +5,7 @@ <param name="filename">buildah</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> - <param name="revision">v1.19.4</param> + <param name="revision">v1.19.6</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.BxEscj/_old 2021-02-22 14:41:20.172682587 +0100 +++ /var/tmp/diff_new_pack.BxEscj/_new 2021-02-22 14:41:20.172682587 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/containers/buildah.git</param> - <param name="changesrevision">175c3e87390ee999b6fd55243bb314af1f7607a0</param></service></servicedata> + <param name="changesrevision">f938e05e9325975df1c0d58c4804bcca66584b4d</param></service></servicedata> \ No newline at end of file ++++++ buildah-1.19.4.tar.xz -> buildah-1.19.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/CHANGELOG.md new/buildah-1.19.6/CHANGELOG.md --- old/buildah-1.19.4/CHANGELOG.md 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/CHANGELOG.md 2021-02-18 23:03:21.000000000 +0100 @@ -2,6 +2,18 @@ # Changelog +## v1.19.6 (2021-02-18) + Bump c/containers/storage v1.24.6 + Don't fail copy to emptydir + Workaround for RHEL gating test failure + Fix config-flags-verification test on F33 + Fix bud capabilities test + Stop overriding the location of the blob info cache + Fix caching layers with build args + +## v1.19.5 (2021-02-09) + Vendor in latest containers/image and common + ## v1.19.4 (2021-02-06) run: fix check for host pid namespace bump containernetworking/cni library to v0.8.1 - fix for CVE-2021-20206 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/add.go new/buildah-1.19.6/add.go --- old/buildah-1.19.4/add.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/add.go 2021-02-18 23:03:21.000000000 +0100 @@ -303,6 +303,13 @@ renameTarget = filepath.Base(extractDirectory) extractDirectory = filepath.Dir(extractDirectory) } + + // if the destination is a directory that doesn't yet exist, let's copy it. + newDestDirFound := false + if (len(destStats) == 1 || len(destStats[0].Globbed) == 0) && destMustBeDirectory && !destCanBeFile { + newDestDirFound = true + } + if len(destStats) == 1 && len(destStats[0].Globbed) == 1 && destStats[0].Results[destStats[0].Globbed[0]].IsRegular { if destMustBeDirectory { return errors.Errorf("destination %v already exists but is not a directory", destination) @@ -415,6 +422,11 @@ if !globInfo.IsDir || !includeDirectoryAnyway(rel, pm) { continue } + } else { + // if the destination is a directory that doesn't yet exist, and is not excluded, let's copy it. + if newDestDirFound { + itemsCopied++ + } } } else { // Make sure we don't trigger a "copied nothing" error for an empty context diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/buildah.go new/buildah-1.19.6/buildah.go --- old/buildah-1.19.4/buildah.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/buildah.go 2021-02-18 23:03:21.000000000 +0100 @@ -28,7 +28,7 @@ Package = "buildah" // Version for the Package. Bump version in contrib/rpm/buildah.spec // too. - Version = "1.19.4" + Version = "1.19.6" // 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/changelog.txt new/buildah-1.19.6/changelog.txt --- old/buildah-1.19.4/changelog.txt 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/changelog.txt 2021-02-18 23:03:21.000000000 +0100 @@ -1,3 +1,16 @@ + +- Changelog for v1.19.6 (2021-02-18) + * Bump c/containers/storage v1.24.6 + * Don't fail copy to emptydir + * Workaround for RHEL gating test failure + * Fix config-flags-verification test on F33 + * Fix bud capabilities test + * Stop overriding the location of the blob info cache + * Fix caching layers with build args + +- Changelog for v1.19.5 (2021-02-09) + * Vendor in latest containers/image and common + - Changelog for v1.19.4 (2021-02-06) * run: fix check for host pid namespace * bump containernetworking/cni library to v0.8.1 - fix for CVE-2021-20206 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/common.go new/buildah-1.19.6/common.go --- old/buildah-1.19.4/common.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/common.go 2021-02-18 23:03:21.000000000 +0100 @@ -56,9 +56,6 @@ sc.SignaturePolicyPath = signaturePolicyPath } if store != nil { - if sc.BlobInfoCacheDir == "" { - sc.BlobInfoCacheDir = filepath.Join(store.GraphRoot(), "cache") - } if sc.SystemRegistriesConfPath == "" && unshare.IsRootless() { userRegistriesFile := filepath.Join(store.GraphRoot(), "registries.conf") if _, err := os.Stat(userRegistriesFile); err == nil { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/contrib/rpm/buildah.spec new/buildah-1.19.6/contrib/rpm/buildah.spec --- old/buildah-1.19.4/contrib/rpm/buildah.spec 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/contrib/rpm/buildah.spec 2021-02-18 23:03:21.000000000 +0100 @@ -26,7 +26,7 @@ Name: buildah # Bump version in buildah.go too -Version: 1.19.4 +Version: 1.19.6 Release: 1.git%{shortcommit}%{?dist} Summary: A command line tool used to creating OCI Images License: ASL 2.0 @@ -100,7 +100,19 @@ %{_datadir}/bash-completion/completions/* %changelog -* Thu Feb 8, 2021 Dan Walsh <[email protected]> 1.19.4-1 +* Thu Feb 18, 2021 Tom Sweeney <[email protected]> 1.19.6-1 +- Bump c/containers/storage v1.24.6 +- Don't fail copy to emptydir +- Workaround for RHEL gating test failure +- Fix config-flags-verification test on F33 +- Fix bud capabilities test +- Stop overriding the location of the blob info cache +- Fix caching layers with build args + +* Tue Feb 9, 2021 Dan Walsh <[email protected]> 1.19.5-1 +- Vendor in latest containers/image and common + +* Mon Feb 8, 2021 Dan Walsh <[email protected]> 1.19.4-1 - run: fix check for host pid namespace - bump containernetworking/cni library to v0.8.1 - fix for CVE-2021-20206 - Finish plumbing for buildah bud --manifest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/go.mod new/buildah-1.19.6/go.mod --- old/buildah-1.19.4/go.mod 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/go.mod 2021-02-18 23:03:21.000000000 +0100 @@ -5,10 +5,10 @@ require ( github.com/containerd/containerd v1.4.1 // indirect github.com/containernetworking/cni v0.8.1 - github.com/containers/common v0.33.1 - github.com/containers/image/v5 v5.10.1 + github.com/containers/common v0.33.4 + github.com/containers/image/v5 v5.10.2 github.com/containers/ocicrypt v1.0.3 - github.com/containers/storage v1.24.5 + github.com/containers/storage v1.24.6 github.com/docker/distribution v2.7.1+incompatible github.com/docker/go-units v0.4.0 github.com/docker/libnetwork v0.8.0-dev.2.0.20190625141545-5a177b73e316 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/go.sum new/buildah-1.19.6/go.sum --- old/buildah-1.19.4/go.sum 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/go.sum 2021-02-18 23:03:21.000000000 +0100 @@ -78,19 +78,19 @@ github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= github.com/containernetworking/cni v0.8.1 h1:7zpDnQ3T3s4ucOuJ/ZCLrYBxzkg0AELFfII3Epo9TmI= github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containers/common v0.33.1 h1:XpDiq8Cta8+u1s4kpYSEWdB140ZmqgyIXfWkLqKx3z0= -github.com/containers/common v0.33.1/go.mod h1:mjDo/NKeweL/onaspLhZ38WnHXaYmrELHclIdvSnYpY= -github.com/containers/image/v5 v5.9.0 h1:dRmUtcluQcmasNo3DpnRoZjfU0rOu1qZeL6wlDJr10Q= -github.com/containers/image/v5 v5.9.0/go.mod h1:blOEFd/iFdeyh891ByhCVUc+xAcaI3gBegXECwz9UbQ= -github.com/containers/image/v5 v5.10.1 h1:tHhGQ8RCMxJfJLD/PEW1qrOKX8nndledW9qz6UiAxns= +github.com/containers/common v0.33.4 h1:f1jowItfo6xw0bZGZq8oE5dw1pBIkldqB0FqW+HHzG8= +github.com/containers/common v0.33.4/go.mod h1:PhgL71XuC4jJ/1BIqeP7doke3aMFkCP90YBXwDeUr9g= github.com/containers/image/v5 v5.10.1/go.mod h1:JlRLJZv7elVbtHaaaR6Kz8i6G3k2ttj4t7fubwxD9Hs= +github.com/containers/image/v5 v5.10.2 h1:STD9GYR9p/X0qTLmBYsyx8dEM7zQW+qZ8KHoL/64fkg= +github.com/containers/image/v5 v5.10.2/go.mod h1:JlRLJZv7elVbtHaaaR6Kz8i6G3k2ttj4t7fubwxD9Hs= github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b h1:Q8ePgVfHDplZ7U33NwHZkrVELsZP5fYj9pM5WBZB2GE= github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= github.com/containers/ocicrypt v1.0.3 h1:vYgl+RZ9Q3DPMuTfxmN+qp0X2Bj52uuY2vnt6GzVe1c= github.com/containers/ocicrypt v1.0.3/go.mod h1:CUBa+8MRNL/VkpxYIpaMtgn1WgXGyvPQj8jcy0EVG6g= -github.com/containers/storage v1.23.7/go.mod h1:cUT2zHjtx+WlVri30obWmM2gpqpi8jfPsmIzP1TVpEI= github.com/containers/storage v1.24.5 h1:BusfdU0rCS2/Daa/DPw+0iLfGRlYA7UVF7D0el3N7Vk= github.com/containers/storage v1.24.5/go.mod h1:YC+2pY8SkfEAcZkwycxYbpK8EiRbx5soPPwz9dxe4IQ= +github.com/containers/storage v1.24.6 h1:9PBb9PoGuj5B/3MGfxx//RmUjMAklmx3rBbuCkuIc94= +github.com/containers/storage v1.24.6/go.mod h1:YC+2pY8SkfEAcZkwycxYbpK8EiRbx5soPPwz9dxe4IQ= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -235,9 +235,6 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.11.1/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.3 h1:dB4Bn0tN3wdCzQxnS8r06kV74qN/TAfaIS0bVE8h3jc= -github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.5 h1:xNCE0uE6yvTPRS+0wGNMHPo3NIpwnk6aluQZ6R6kRcc= github.com/klauspost/compress v1.11.5/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7 h1:0hzRabrMN4tSTvMfnL3SCv1ZGeAP23ynzodBgaHeMeg= @@ -333,8 +330,6 @@ github.com/opencontainers/runtime-tools v0.9.0 h1:FYgwVsKRI/H9hU32MJ/4MLOzXWodKK5zsQavY8NPMkU= github.com/opencontainers/runtime-tools v0.9.0/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= github.com/opencontainers/selinux v1.5.1/go.mod h1:yTcKuYAh6R95iDpefGLQaPaRwJFwyzAJufJyiTt7s0g= -github.com/opencontainers/selinux v1.6.0 h1:+bIAS/Za3q5FTwWym4fTB0vObnfCf3G/NC7K6Jx62mY= -github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0 h1:+77ba4ar4jsCbL1GLbFL8fFM57w6suPfSS9PDLDY7KM= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= github.com/openshift/imagebuilder v1.1.8 h1:gjiIl8pbNj0eC4XWvFJHATdDvYm64p9/pLDLQWoLZPA= @@ -416,8 +411,6 @@ github.com/tchap/go-patricia v2.3.0+incompatible h1:GkY4dP3cEfEASBPPkWd+AmjYxhmDkqO9/zg7R0lSQRs= github.com/tchap/go-patricia v2.3.0+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= -github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.9 h1:RsKRIA2MO8x56wkkcd3LbtcE/uMszhb6DpRf+3uwa3I= github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= @@ -425,16 +418,12 @@ github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vbatts/tar-split v0.11.1 h1:0Odu65rhcZ3JZaPHxl7tCI3V/C/Q9Zf82UFravl02dE= github.com/vbatts/tar-split v0.11.1/go.mod h1:LEuURwDEiWjRjwu46yU3KVGuUdVv/dcnpcEPSzR8z6g= -github.com/vbauerster/mpb/v5 v5.3.0 h1:vgrEJjUzHaSZKDRRxul5Oh4C72Yy/5VEMb0em+9M0mQ= -github.com/vbauerster/mpb/v5 v5.3.0/go.mod h1:4yTkvAb8Cm4eylAp6t0JRq6pXDkFJ4krUlDqWYkakAs= github.com/vbauerster/mpb/v5 v5.4.0 h1:n8JPunifvQvh6P1D1HAl2Ur9YcmKT1tpoUuiea5mlmg= github.com/vbauerster/mpb/v5 v5.4.0/go.mod h1:fi4wVo7BVQ22QcvFObm+VwliQXlV1eBT8JDaKXR4JGI= github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df h1:OviZH7qLw/7ZovXvuNyL3XQl8UFofeikI1NW1Gypu7k= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= -github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243 h1:R43TdZy32XXSXjJn7M/HhALJ9imq6ztLnChfYJpVDnM= -github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -550,7 +539,6 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/imagebuildah/stage_executor.go new/buildah-1.19.6/imagebuildah/stage_executor.go --- old/buildah-1.19.4/imagebuildah/stage_executor.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/imagebuildah/stage_executor.go 2021-02-18 23:03:21.000000000 +0100 @@ -834,11 +834,12 @@ // Check if there's already an image based on our parent that // has the same change that we're about to make, so far as we // can tell. - // Only do this if there were no build args given by the user, + // Only do this if the step we are on is not an ARG step, // we need to call ib.Run() to correctly put the args together before // determining if a cached layer with the same build args already exists // and that is done in the if block below. - if checkForLayers && len(s.builder.Args) == 0 { + if checkForLayers && step.Command != "arg" { + cacheID, err = s.intermediateImageExists(ctx, node, addedContentSummary, s.stepRequiresLayer(step)) if err != nil { return "", nil, errors.Wrap(err, "error checking if cached image exists from a previous build") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/tests/authenticate.bats new/buildah-1.19.6/tests/authenticate.bats --- old/buildah-1.19.4/tests/authenticate.bats 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/tests/authenticate.bats 2021-02-18 23:03:21.000000000 +0100 @@ -33,7 +33,12 @@ expect_output --substring "Writing manifest to image destination" # With tls-verify=true, should fail due to self-signed cert - run_buildah 125 push --signature-policy ${TESTSDIR}/policy.json --tls-verify=true alpine localhost:5000/my-alpine + # The magic GODEBUG is needed for RHEL on 2021-01-20. Without it, + # we get the following error instead of 'unknown authority': + # x509: certificate relies on legacy Common Name field, use SANs or [...] + # It is possible that this is a temporary workaround, and Go + # may remove it without notice. We'll deal with that then. + GODEBUG=x509ignoreCN=0 run_buildah 125 push --signature-policy ${TESTSDIR}/policy.json --tls-verify=true alpine localhost:5000/my-alpine expect_output --substring " x509: certificate signed by unknown authority" \ "push with --tls-verify=true" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/tests/bud/use-layers/Dockerfile.build-args new/buildah-1.19.6/tests/bud/use-layers/Dockerfile.build-args --- old/buildah-1.19.4/tests/bud/use-layers/Dockerfile.build-args 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/tests/bud/use-layers/Dockerfile.build-args 2021-02-18 23:03:21.000000000 +0100 @@ -1,4 +1,4 @@ FROM alpine ARG user -RUN echo $user +RUN echo $user | base64 RUN touch /tmp/hello diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/tests/bud.bats new/buildah-1.19.6/tests/bud.bats --- old/buildah-1.19.4/tests/bud.bats 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/tests/bud.bats 2021-02-18 23:03:21.000000000 +0100 @@ -300,7 +300,15 @@ run_buildah images -a expect_line_count 5 - # two more, starting at the "echo $user" instruction + # running the same build again does not run the commands again + run_buildah bud --signature-policy ${TESTSDIR}/policy.json --build-arg=user=0 --layers -t test -f Dockerfile.build-args ${TESTSDIR}/bud/use-layers + if [[ "$output" =~ "MAo=" ]]; then + # MAo= is the base64 of "0\n" (i.e. `echo 0`) + printf "Expected command not to run again if layer is cached\n" >&2 + false + fi + + # two more, starting at the "echo $user | base64" instruction run_buildah bud --signature-policy ${TESTSDIR}/policy.json --build-arg=user=1 --layers -t test1 -f Dockerfile.build-args ${TESTSDIR}/bud/use-layers run_buildah images -a expect_line_count 8 @@ -310,7 +318,7 @@ run_buildah images -a expect_line_count 9 - # two more, starting at the "echo $user" instruction + # two more, starting at the "echo $user | base64" instruction run_buildah bud --signature-policy ${TESTSDIR}/policy.json --layers -t test3 -f Dockerfile.build-args ${TESTSDIR}/bud/use-layers run_buildah images -a expect_line_count 12 @@ -2306,7 +2314,9 @@ @test "bud capabilities test" { _prefetch busybox - run_buildah bud -t testcap --signature-policy ${TESTSDIR}/policy.json -f ${TESTSDIR}/bud/capabilities/Dockerfile + # --cap-add necessary b/c https://github.com/containers/common/pull/319 + # removed cap_net_raw, cap_mknod, and cap_audit_write + run_buildah bud --cap-add cap_net_raw,cap_mknod,cap_audit_write -t testcap --signature-policy ${TESTSDIR}/policy.json -f ${TESTSDIR}/bud/capabilities/Dockerfile expect_output --substring "uid=3267" expect_output --substring "CapBnd: 00000000a80425fb" expect_output --substring "CapEff: 0000000000000000" @@ -2552,3 +2562,23 @@ run_buildah manifest inspect testlist expect_output --substring $digest } + + +@test "bud test empty newdir" { + _prefetch alpine + mytmpdir=${TESTDIR}/my-dir + mkdir -p ${mytmpdir} +cat > $mytmpdir/Containerfile << _EOF +FROM alpine as galaxy +RUN mkdir -p /usr/share/ansible/roles /usr/share/ansible/collections +RUN echo "bar" +RUN echo "foo" > /usr/share/ansible/collections/file.txt +FROM galaxy +RUN mkdir -p /usr/share/ansible/roles /usr/share/ansible/collections +COPY --from=galaxy /usr/share/ansible/roles /usr/share/ansible/roles +COPY --from=galaxy /usr/share/ansible/collections /usr/share/ansible/collections +_EOF + + run_buildah bud --layers --signature-policy ${TESTSDIR}/policy.json -t testbud $mytmpdir + expect_output --substring "COPY --from=galaxy /usr/share/ansible/collections /usr/share/ansible/collections" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/tests/config.bats new/buildah-1.19.6/tests/config.bats --- old/buildah-1.19.4/tests/config.bats 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/tests/config.bats 2021-02-18 23:03:21.000000000 +0100 @@ -29,7 +29,7 @@ expect_output --substring 'error parsing --healthcheck "AB \"CD": invalid command line string' run_buildah 125 config --healthcheck-interval ABCD $cid - expect_output --substring 'error parsing --healthcheck-interval "ABCD": time: invalid duration ABCD' + expect_output --substring 'error parsing --healthcheck-interval "ABCD": time: invalid duration "?ABCD"?' run_buildah 125 config --cmd 'AB "CD' $cid expect_output --substring 'error parsing --cmd "AB \"CD": invalid command line string' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/github.com/containers/common/pkg/config/default.go new/buildah-1.19.6/vendor/github.com/containers/common/pkg/config/default.go --- old/buildah-1.19.4/vendor/github.com/containers/common/pkg/config/default.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/github.com/containers/common/pkg/config/default.go 2021-02-18 23:03:21.000000000 +0100 @@ -518,3 +518,9 @@ func (c *Config) Umask() string { return c.Containers.Umask } + +// LogDriver returns the logging driver to be used +// currently k8s-file or journald +func (c *Config) LogDriver() string { + return c.Containers.LogDriver +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/github.com/containers/common/pkg/config/util_supported.go new/buildah-1.19.6/vendor/github.com/containers/common/pkg/config/util_supported.go --- old/buildah-1.19.4/vendor/github.com/containers/common/pkg/config/util_supported.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/github.com/containers/common/pkg/config/util_supported.go 2021-02-18 23:03:21.000000000 +0100 @@ -25,6 +25,17 @@ rootlessRuntimeDirOnce.Do(func() { runtimeDir := os.Getenv("XDG_RUNTIME_DIR") + if runtimeDir != "" { + st, err := os.Stat(runtimeDir) + if err != nil { + rootlessRuntimeDirError = err + return + } + if int(st.Sys().(*syscall.Stat_t).Uid) != os.Geteuid() { + rootlessRuntimeDirError = fmt.Errorf("XDG_RUNTIME_DIR directory %q is not owned by the current user", runtimeDir) + return + } + } uid := fmt.Sprintf("%d", unshare.GetRootlessUID()) if runtimeDir == "" { tmpDir := filepath.Join("/run", "user", uid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/github.com/containers/common/pkg/seccomp/default_linux.go new/buildah-1.19.6/vendor/github.com/containers/common/pkg/seccomp/default_linux.go --- old/buildah-1.19.4/vendor/github.com/containers/common/pkg/seccomp/default_linux.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/github.com/containers/common/pkg/seccomp/default_linux.go 2021-02-18 23:03:21.000000000 +0100 @@ -87,6 +87,7 @@ "epoll_ctl", "epoll_ctl_old", "epoll_pwait", + "epoll_pwait2", "epoll_wait", "epoll_wait_old", "eventfd", @@ -115,7 +116,11 @@ "flock", "fork", "fremovexattr", + "fsconfig", "fsetxattr", + "fsmount", + "fsopen", + "fspick", "fstat", "fstat64", "fstatat64", @@ -203,6 +208,7 @@ "mmap", "mmap2", "mount", + "move_mount", "mprotect", "mq_getsetattr", "mq_notify", @@ -225,6 +231,7 @@ "open", "openat", "openat2", + "open_tree", "pause", "pidfd_getfd", "pidfd_open", @@ -630,6 +637,7 @@ { Names: []string{ "kcmp", + "process_madvise", "process_vm_readv", "process_vm_writev", "ptrace", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/github.com/containers/common/pkg/seccomp/seccomp.json new/buildah-1.19.6/vendor/github.com/containers/common/pkg/seccomp/seccomp.json --- old/buildah-1.19.4/vendor/github.com/containers/common/pkg/seccomp/seccomp.json 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/github.com/containers/common/pkg/seccomp/seccomp.json 2021-02-18 23:03:21.000000000 +0100 @@ -89,6 +89,7 @@ "epoll_ctl", "epoll_ctl_old", "epoll_pwait", + "epoll_pwait2", "epoll_wait", "epoll_wait_old", "eventfd", @@ -117,7 +118,11 @@ "flock", "fork", "fremovexattr", + "fsconfig", "fsetxattr", + "fsmount", + "fsopen", + "fspick", "fstat", "fstat64", "fstatat64", @@ -204,6 +209,7 @@ "mmap", "mmap2", "mount", + "move_mount", "mprotect", "mq_getsetattr", "mq_notify", @@ -226,6 +232,7 @@ "open", "openat", "openat2", + "open_tree", "pause", "pidfd_getfd", "pidfd_open", @@ -728,6 +735,7 @@ { "names": [ "kcmp", + "process_madvise", "process_vm_readv", "process_vm_writev", "ptrace" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/github.com/containers/common/version/version.go new/buildah-1.19.6/vendor/github.com/containers/common/version/version.go --- old/buildah-1.19.4/vendor/github.com/containers/common/version/version.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/github.com/containers/common/version/version.go 2021-02-18 23:03:21.000000000 +0100 @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.33.1" +const Version = "0.33.4" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go new/buildah-1.19.6/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go --- old/buildah-1.19.4/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/github.com/containers/image/v5/pkg/sysregistriesv2/shortnames.go 2021-02-18 23:03:21.000000000 +0100 @@ -7,6 +7,7 @@ "github.com/BurntSushi/toml" "github.com/containers/image/v5/docker/reference" + "github.com/containers/image/v5/internal/rootless" "github.com/containers/image/v5/types" "github.com/containers/storage/pkg/homedir" "github.com/containers/storage/pkg/lockfile" @@ -27,12 +28,24 @@ return ctx.UserShortNameAliasConfPath, nil } - configHome, err := homedir.GetConfigHome() - if err != nil { - return "", err + if rootless.GetRootlessEUID() == 0 { + // Root user or in a non-conforming user NS + return filepath.Join("/var/cache", userShortNamesFile), nil } - return filepath.Join(configHome, userShortNamesFile), nil + // Rootless user + var cacheRoot string + if xdgCache := os.Getenv("XDG_CACHE_HOME"); xdgCache != "" { + cacheRoot = xdgCache + } else { + configHome, err := homedir.GetConfigHome() + if err != nil { + return "", err + } + cacheRoot = filepath.Join(configHome, ".cache") + } + + return filepath.Join(cacheRoot, userShortNamesFile), nil } // shortNameAliasConf is a subset of the `V2RegistriesConf` format. It's used in the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/github.com/containers/image/v5/version/version.go new/buildah-1.19.6/vendor/github.com/containers/image/v5/version/version.go --- old/buildah-1.19.4/vendor/github.com/containers/image/v5/version/version.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/github.com/containers/image/v5/version/version.go 2021-02-18 23:03:21.000000000 +0100 @@ -8,7 +8,7 @@ // VersionMinor is for functionality in a backwards-compatible manner VersionMinor = 10 // VersionPatch is for backwards-compatible bug fixes - VersionPatch = 1 + VersionPatch = 2 // VersionDev indicates development branch. Releases will be empty string. VersionDev = "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/github.com/containers/storage/.cirrus.yml new/buildah-1.19.6/vendor/github.com/containers/storage/.cirrus.yml --- old/buildah-1.19.4/vendor/github.com/containers/storage/.cirrus.yml 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/github.com/containers/storage/.cirrus.yml 2021-02-18 23:03:21.000000000 +0100 @@ -25,7 +25,7 @@ # GCE project where images live IMAGE_PROJECT: "libpod-218412" # VM Image built in containers/automation_images - _BUILT_IMAGE_SUFFIX: "c6233039174893568" + _BUILT_IMAGE_SUFFIX: "c6524344056676352" FEDORA_CACHE_IMAGE_NAME: "fedora-${_BUILT_IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${_BUILT_IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${_BUILT_IMAGE_SUFFIX}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/github.com/containers/storage/VERSION new/buildah-1.19.6/vendor/github.com/containers/storage/VERSION --- old/buildah-1.19.4/vendor/github.com/containers/storage/VERSION 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/github.com/containers/storage/VERSION 2021-02-18 23:03:21.000000000 +0100 @@ -1 +1 @@ -1.24.5 +1.24.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/github.com/containers/storage/drivers/overlay/overlay.go new/buildah-1.19.6/vendor/github.com/containers/storage/drivers/overlay/overlay.go --- old/buildah-1.19.4/vendor/github.com/containers/storage/drivers/overlay/overlay.go 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/github.com/containers/storage/drivers/overlay/overlay.go 2021-02-18 23:03:21.000000000 +0100 @@ -125,6 +125,15 @@ graphdriver.Register("overlay2", Init) } +func hasMetacopyOption(opts []string) bool { + for _, s := range opts { + if s == "metacopy=on" { + return true + } + } + return false +} + // Init returns the a native diff driver for overlay filesystem. // If overlay filesystem is not supported on the host, a wrapped graphdriver.ErrNotSupported is returned as error. // If an overlay filesystem is not supported over an existing filesystem then a wrapped graphdriver.ErrIncompatibleFS is returned. @@ -863,7 +872,17 @@ } readWrite := true - for _, o := range options.Options { + optsList := options.Options + if len(optsList) == 0 { + optsList = strings.Split(d.options.mountOptions, ",") + } else { + // If metacopy=on is present in d.options.mountOptions it must be present in the mount + // options otherwise the kernel refuses to follow the metacopy xattr. + if hasMetacopyOption(strings.Split(d.options.mountOptions, ",")) && !hasMetacopyOption(options.Options) { + optsList = append(optsList, "metacopy=on") + } + } + for _, o := range optsList { if o == "ro" { readWrite = false break @@ -1001,10 +1020,8 @@ } else { opts = fmt.Sprintf("lowerdir=%s:%s", diffDir, strings.Join(absLowers, ":")) } - if len(options.Options) > 0 { - opts = fmt.Sprintf("%s,%s", strings.Join(options.Options, ","), opts) - } else if d.options.mountOptions != "" { - opts = fmt.Sprintf("%s,%s", d.options.mountOptions, opts) + if len(optsList) > 0 { + opts = fmt.Sprintf("%s,%s", strings.Join(optsList, ","), opts) } mountData := label.FormatMountLabel(opts, options.MountLabel) mountFunc := unix.Mount diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/buildah-1.19.4/vendor/modules.txt new/buildah-1.19.6/vendor/modules.txt --- old/buildah-1.19.4/vendor/modules.txt 2021-02-08 19:32:15.000000000 +0100 +++ new/buildah-1.19.6/vendor/modules.txt 2021-02-18 23:03:21.000000000 +0100 @@ -58,7 +58,7 @@ github.com/containernetworking/cni/pkg/types/current github.com/containernetworking/cni/pkg/utils github.com/containernetworking/cni/pkg/version -# github.com/containers/common v0.33.1 +# github.com/containers/common v0.33.4 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/apparmor/internal/supported github.com/containers/common/pkg/auth @@ -71,7 +71,7 @@ github.com/containers/common/pkg/subscriptions github.com/containers/common/pkg/umask github.com/containers/common/version -# github.com/containers/image/v5 v5.10.1 +# github.com/containers/image/v5 v5.10.2 github.com/containers/image/v5/copy github.com/containers/image/v5/directory github.com/containers/image/v5/directory/explicitfilepath @@ -129,7 +129,7 @@ github.com/containers/ocicrypt/keywrap/pkcs7 github.com/containers/ocicrypt/spec github.com/containers/ocicrypt/utils -# github.com/containers/storage v1.24.5 +# github.com/containers/storage v1.24.6 github.com/containers/storage github.com/containers/storage/drivers github.com/containers/storage/drivers/aufs
