From 917befb593e946b903abb469f77ab6ac9037abe0 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 27 Feb 2018 05:00:47 -0800 Subject: [PATCH 01/20] Fix handling of buildah run command options --- .gitignore | 1 + buildah.spec | 16 +++++++++++++--- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bc56a35..4b94a4b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /buildah-6bad262.tar.gz /buildah-8badcc2.tar.gz /buildah-ef0ca9c.tar.gz +/buildah-d1330a5.tar.gz diff --git a/buildah.spec b/buildah.spec index 2f3bb06..09fc1ea 100644 --- a/buildah.spec +++ b/buildah.spec @@ -14,12 +14,12 @@ # https://github.com/projectatomic/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit ef0ca9cd2d69e8ca70d07e19386c676ae4985644 +%global commit d1330a5c4680dd18e1d58015f94cb3530c248eb9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo} -Version: 0.13 -Release: 2.git%{shortcommit}%{?dist} +Version: 0.15 +Release: 1.git%{shortcommit}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -85,6 +85,16 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Tue Feb 27 2018 Dan Walsh 0.15-1 +- Fix handling of buildah run command options + +* Mon Feb 26 2018 Dan Walsh 0.14-1 +- If commonOpts do not exist, we should return rather then segfault +- Display full error string instead of just status +- Implement --volume and --shm-size for bud and from +- Fix secrets patch for buildah bud +- Fixes the naming issue of blobs and config for the dir transport by removing the .tar extension + * Sun Feb 25 2018 Peter Robinson 0.13-2 - Build on ARMv7 too (Fedora supports containers on that arch too) diff --git a/sources b/sources index 318cf5d..7387fed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-ef0ca9c.tar.gz) = 4199a2efa1042a8669abf9b051133bdf4cf9b802368fb88032125911a12e63c092f83bed7269eec80f20862d34d0f673fb5b83e474230fa853de784f8c5bf32e +SHA512 (buildah-d1330a5.tar.gz) = ec9fde97d29c39bc73bb52afaa68656468fb2325a08bb064137a2d00e1a63fa5f7e881df78de526533b4f56f900322c78940cdbcc317ade4a36464ebd2494fd5 From 80c3b75233626be05619b959fe4675cbfa0168bd Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 4 Apr 2018 10:19:22 -0400 Subject: [PATCH 02/20] Add support for shell Vendor in latest containers/image docker-archive generates docker legacy compatible images - Do not create $DiffID subdirectories for layers with no configs Ensure the layer IDs in legacy docker/tarfile metadata are unique - docker-archive: repeated layers are symlinked in the tar file - sysregistries: remove all trailing slashes - Improve docker/* error messages - Fix failure to make auth directory - Create a new slice in Schema1.UpdateLayerInfos - Drop unused storageImageDestination.{image,systemContext} - Load a *storage.Image only once in storageImageSource - Support gzip for docker-archive files - Remove .tar extension from blob and config file names - ostree, src: support copy of compressed layers - ostree: re-pull layer if it misses uncompressed_digest|uncompressed_size - image: fix docker schema v1 -> OCI conversion - Add /etc/containers/certs.d as default certs directory Change image time to locale, add troubleshooting.md, add logo to other mds Allow --cmd parameter to have commands as values Document the mounts.conf file Fix man pages to format correctly buildah from now supports pulling images using the following transports: docker-archive, oci-archive, and dir. If the user overrides the storage driver, the options should be dropped Show Config/Manifest as JSON string in inspect when format is not set Adds feature to pull compressed docker-archive files --- .gitignore | 1 + buildah.spec | 33 +++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4b94a4b..36f6083 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /buildah-8badcc2.tar.gz /buildah-ef0ca9c.tar.gz /buildah-d1330a5.tar.gz +/buildah-82529cd.tar.gz diff --git a/buildah.spec b/buildah.spec index 09fc1ea..8af182b 100644 --- a/buildah.spec +++ b/buildah.spec @@ -14,11 +14,11 @@ # https://github.com/projectatomic/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit d1330a5c4680dd18e1d58015f94cb3530c248eb9 +%global commit 82529cdf31628d4636214d93b8d28a05443fce60 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo} -Version: 0.15 +Version: 0.16 Release: 1.git%{shortcommit}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -85,6 +85,35 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Wed Apr 4 2018 Dan Walsh 0.16-1 +- Add support for shell +- Vendor in latest containers/image +- docker-archive generates docker legacy compatible images +- Do not create $DiffID subdirectories for layers with no configs +- Ensure the layer IDs in legacy docker/tarfile metadata are unique +- docker-archive: repeated layers are symlinked in the tar file +- sysregistries: remove all trailing slashes +- Improve docker/* error messages +- Fix failure to make auth directory +- Create a new slice in Schema1.UpdateLayerInfos +- Drop unused storageImageDestination.{image,systemContext} +- Load a *storage.Image only once in storageImageSource +- Support gzip for docker-archive files +- Remove .tar extension from blob and config file names +- ostree, src: support copy of compressed layers +- ostree: re-pull layer if it misses uncompressed_digest|uncompressed_size +- image: fix docker schema v1 -> OCI conversion +- Add /etc/containers/certs.d as default certs directory +- Change image time to locale, add troubleshooting.md, add logo to other mds +- Allow --cmd parameter to have commands as values +- Document the mounts.conf file +- Fix man pages to format correctly +- buildah from now supports pulling images using the following transports: +- docker-archive, oci-archive, and dir. +- If the user overrides the storage driver, the options should be dropped +- Show Config/Manifest as JSON string in inspect when format is not set +- Adds feature to pull compressed docker-archive files + * Tue Feb 27 2018 Dan Walsh 0.15-1 - Fix handling of buildah run command options diff --git a/sources b/sources index 7387fed..5083be7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-d1330a5.tar.gz) = ec9fde97d29c39bc73bb52afaa68656468fb2325a08bb064137a2d00e1a63fa5f7e881df78de526533b4f56f900322c78940cdbcc317ade4a36464ebd2494fd5 +SHA512 (buildah-82529cd.tar.gz) = 979a9e1cef5368ae03c0f67b9649b7f74ab3c294e1e1efe2b23e4e2a7ddeb143d73ee8cdd2cbb0bba9266fdf5db059cac0dcdafb461f3e0f60cdecf6e21684a5 From fcc97489ebb5c01887960568995fe67343b06d6a Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 7 May 2018 06:56:12 -0700 Subject: [PATCH 03/20] Remove buildah run cmd and entrypoint execution Add Files section with registries.conf to pertinent man pages Force "localhost" as a default registry Add --compress, --rm, --squash flags as a noop for bud Add FIPS mode secret to buildah run and bud Add config --comment/--domainname/--history-comment/--hostname Add support for --iidfile to bud and commit Add /bin/sh -c to entrypoint in config buildah images and podman images are listing different sizes Remove tarball as an option from buildah push --help Update entrypoint behaviour to match docker Display imageId after commit config: add support for StopSignal Allow referencing stages as index and names Add multi-stage builds support Vendor in latest imagebuilder, to get mixed case AS support Allow umount to have multi-containers Update buildah push doc buildah bud walks symlinks Imagename is required for commit atm, update manpage --- .gitignore | 18 ++++++ buildah.spec | 160 ++++++++++++++++++++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 146 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 36f6083..8997ae2 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,21 @@ /buildah-ef0ca9c.tar.gz /buildah-d1330a5.tar.gz /buildah-82529cd.tar.gz +/buildah-4339223.tar.gz +/buildah-83d7d10.tar.gz +/buildah-6421399.tar.gz +/buildah-45a4b81.tar.gz +/buildah-28a27a3.tar.gz +/buildah-e008b73.tar.gz +/buildah-d84f05a.tar.gz +/buildah-b16a1ea.tar.gz +/buildah-fdc3998.tar.gz +/buildah-49abf82.tar.gz +/buildah-ca1704f.tar.gz +/buildah-c50c287.tar.gz +/buildah-adb8e6f.tar.gz +/buildah-e130f2b.tar.gz +/buildah-a4f5707.tar.gz +/buildah-6fe2b55.tar.gz +/buildah-45772e8.tar.gz +/buildah-dd02e70.tar.gz diff --git a/buildah.spec b/buildah.spec index 8af182b..1a83c22 100644 --- a/buildah.spec +++ b/buildah.spec @@ -7,42 +7,42 @@ %global debug_package %{nil} %endif -%global provider github -%global provider_tld com -%global project projectatomic -%global repo buildah +%global provider github +%global provider_tld com +%global project projectatomic +%global repo buildah # https://github.com/projectatomic/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 82529cdf31628d4636214d93b8d28a05443fce60 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global import_path %{provider_prefix} +%global commit0 1ab80bcd88929a94c52268a5af8443c0055a42cb +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -Name: %{repo} -Version: 0.16 -Release: 1.git%{shortcommit}%{?dist} -Summary: A command line tool used for creating OCI Images -License: ASL 2.0 -URL: https://%{provider_prefix} -Source: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Name: %{repo} +Version: 1.0 +Release: 1.git%{shortcommit0}%{?dist} +Summary: A command line tool used for creating OCI Images +License: ASL 2.0 +URL: https://%{provider_prefix} +Source: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz -ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x +ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -BuildRequires: git -BuildRequires: glib2-devel -BuildRequires: libseccomp-devel -BuildRequires: ostree-devel -BuildRequires: glibc-static -BuildRequires: go-md2man -BuildRequires: gpgme-devel -BuildRequires: device-mapper-devel -BuildRequires: btrfs-progs-devel -BuildRequires: libassuan-devel -Requires: runc >= 1.0.0-17 -Requires: skopeo-containers >= 0.1.20-2 -Requires: container-selinux -Requires: ostree -Provides: %{repo} = %{version}-%{release} +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: git +BuildRequires: glib2-devel +BuildRequires: libseccomp-devel +BuildRequires: ostree-devel +BuildRequires: glibc-static +BuildRequires: go-md2man +BuildRequires: gpgme-devel +BuildRequires: device-mapper-devel +BuildRequires: btrfs-progs-devel +BuildRequires: libassuan-devel +BuildRequires: make +Requires: runc >= 1.0.0-17 +Requires: skopeo-containers >= 0.1.20-2 +Requires: container-selinux +Requires: ostree %description The %{name} package provides a command line tool which can be used to @@ -54,7 +54,7 @@ or * delete a working container or an image %prep -%autosetup -Sgit -n %{name}-%{commit} +%autosetup -Sgit -n %{name}-%{commit0} %build mkdir _build @@ -66,7 +66,7 @@ popd mv vendor src export GOPATH=$(pwd)/_build:$(pwd):%{gopath} -make all GIT_COMMIT=%{shortcommit} +make all GIT_COMMIT=%{shortcommit0} %install export GOPATH=$(pwd)/_build:$(pwd):%{gopath} @@ -85,6 +85,100 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Mon May 07 2018 Dan Walsh 1.0-1 +- Remove buildah run cmd and entrypoint execution +- Add Files section with registries.conf to pertinent man pages +- Force "localhost" as a default registry +- Add --compress, --rm, --squash flags as a noop for bud +- Add FIPS mode secret to buildah run and bud +- Add config --comment/--domainname/--history-comment/--hostname +- Add support for --iidfile to bud and commit +- Add /bin/sh -c to entrypoint in config +- buildah images and podman images are listing different sizes +- Remove tarball as an option from buildah push --help +- Update entrypoint behaviour to match docker +- Display imageId after commit +- config: add support for StopSignal +- Allow referencing stages as index and names +- Add multi-stage builds support +- Vendor in latest imagebuilder, to get mixed case AS support +- Allow umount to have multi-containers +- Update buildah push doc +- buildah bud walks symlinks +- Imagename is required for commit atm, update manpage + +* Mon May 07 2018 Lokesh Mandvekar (Bot) - 0.16-25.gitdd02e70 +- autobuilt dd02e70 + +* Sat May 05 2018 Lokesh Mandvekar (Bot) - 0.16-24.git45772e8 +- autobuilt 45772e8 + +* Fri May 04 2018 Lokesh Mandvekar (Bot) - 0.16-23.git6fe2b55 +- autobuilt 6fe2b55 + +* Wed May 02 2018 Lokesh Mandvekar (Bot) - 0.16-22.gita4f5707 +- autobuilt a4f5707 + +* Wed May 02 2018 Lokesh Mandvekar (Bot) - 0.16-21.gite130f2b +- autobuilt commit e130f2b + +* Tue May 01 2018 Lokesh Mandvekar (Bot) - 0.16-20.gitadb8e6f +- autobuilt commit adb8e6f + +* Sat Apr 28 2018 Lokesh Mandvekar (Bot) - 0.16-19.gitc50c287 +- autobuilt commit c50c287 + +* Fri Apr 27 2018 Lokesh Mandvekar (Bot) - 0.16-18.gitca1704f +- autobuilt commit ca1704f + +* Wed Apr 25 2018 Lokesh Mandvekar (Bot) - 0.16-17.git49abf82 +- autobuilt commit 49abf82 + +* Tue Apr 24 2018 Lokesh Mandvekar (Bot) - 0.16-16.gitfdc3998 +- autobuilt commit fdc3998 + +* Tue Apr 24 2018 Lokesh Mandvekar (Bot) - 0.16-15.gitb16a1ea +- autobuilt commit b16a1ea + +* Fri Apr 20 2018 Lokesh Mandvekar (Bot) - 0.16-14.gitd84f05a +- autobuilt commit d84f05a + +* Thu Apr 19 2018 Lokesh Mandvekar (Bot) - 0.16-13.gite008b73 +- autobuilt commit e008b73 + +* Thu Apr 19 2018 Lokesh Mandvekar (Bot) - 0.16-12.git28a27a3 +- autobuilt commit 28a27a3 + +* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 0.16-11.git45a4b81 +- autobuilt commit 45a4b81 + +* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 0.16-10.git45a4b81 +- autobuilt commit 45a4b81 + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 0.16-9.git6421399 +- autobuilt commit 6421399 + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 0.16-8.git83d7d10 +- autobuilt commit 83d7d10 + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 0.16-7.git83d7d10 +- autobuilt commit 83d7d10 + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 0.16-6.git83d7d10 +- autobuilt commit 83d7d10 + +* Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 0.16-5.git4339223 +- autobuilt commit 4339223 + +* Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 0.16-4.git4339223 +- autobuilt commit 4339223 + +* Mon Apr 09 2018 Lokesh Mandvekar - 0.16-3.git4339223 +- autobuilt commit 4339223 + +* Sun Apr 08 2018 Lokesh Mandvekar - 0.16-2.git4743c2e +- autobuilt commit 4743c2e + * Wed Apr 4 2018 Dan Walsh 0.16-1 - Add support for shell - Vendor in latest containers/image diff --git a/sources b/sources index 5083be7..4a51cbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-82529cd.tar.gz) = 979a9e1cef5368ae03c0f67b9649b7f74ab3c294e1e1efe2b23e4e2a7ddeb143d73ee8cdd2cbb0bba9266fdf5db059cac0dcdafb461f3e0f60cdecf6e21684a5 +SHA512 (buildah-dd02e70.tar.gz) = 8030ceee96bcc6839f4ff0b9da388b4ae743f2bdd9ab4f398fca0d9f2dccada54c963527751503dccbb09ee1f4c9c99204fbe9b7d7f64964aef2978b776c8d19 From 717f363a73ed32dbcbd9d791d85bef748a63bd67 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 7 May 2018 06:58:29 -0700 Subject: [PATCH 04/20] Remove buildah run cmd and entrypoint execution Add Files section with registries.conf to pertinent man pages Force "localhost" as a default registry Add --compress, --rm, --squash flags as a noop for bud Add FIPS mode secret to buildah run and bud Add config --comment/--domainname/--history-comment/--hostname Add support for --iidfile to bud and commit Add /bin/sh -c to entrypoint in config buildah images and podman images are listing different sizes Remove tarball as an option from buildah push --help Update entrypoint behaviour to match docker Display imageId after commit config: add support for StopSignal Allow referencing stages as index and names Add multi-stage builds support Vendor in latest imagebuilder, to get mixed case AS support Allow umount to have multi-containers Update buildah push doc buildah bud walks symlinks Imagename is required for commit atm, update manpage --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8997ae2..7b71fbd 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /buildah-6fe2b55.tar.gz /buildah-45772e8.tar.gz /buildah-dd02e70.tar.gz +/buildah-1ab80bc.tar.gz diff --git a/sources b/sources index 4a51cbe..b19b522 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-dd02e70.tar.gz) = 8030ceee96bcc6839f4ff0b9da388b4ae743f2bdd9ab4f398fca0d9f2dccada54c963527751503dccbb09ee1f4c9c99204fbe9b7d7f64964aef2978b776c8d19 +SHA512 (buildah-1ab80bc.tar.gz) = c438d8822411bed1156f4dc24ae223f47741991bad5d1250ea59fc8c2dc304080fa67b4900a40cea48ac3f3cbc159e15d4dcc3f310342eb7542dcda05cf5c076 From a62528f14b637535cd42576b12319316bd44d434 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 10 Jun 2018 17:26:40 -0400 Subject: [PATCH 05/20] bump to v1.1 --- .gitignore | 20 +++++++ buildah.spec | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++- sources | 2 +- 3 files changed, 173 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7b71fbd..ff298d3 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,23 @@ /buildah-45772e8.tar.gz /buildah-dd02e70.tar.gz /buildah-1ab80bc.tar.gz +/buildah-906ee37.tar.gz +/buildah-fe204e4.tar.gz +/buildah-2ea3e11.tar.gz +/buildah-b9a1041.tar.gz +/buildah-ce8d467.tar.gz +/buildah-8515867.tar.gz +/buildah-3e320b9.tar.gz +/buildah-2749191.tar.gz +/buildah-25f4e8e.tar.gz +/buildah-88affbd.tar.gz +/buildah-ebb0d8e.tar.gz +/buildah-5595d4d.tar.gz +/buildah-73bfd79.tar.gz +/buildah-03686e5.tar.gz +/buildah-70641ee.tar.gz +/buildah-f90b6c0.tar.gz +/buildah-d3d097b.tar.gz +/buildah-c306342.tar.gz +/buildah-f449b28.tar.gz +/buildah-fbf46d3.tar.gz diff --git a/buildah.spec b/buildah.spec index 1a83c22..50cc597 100644 --- a/buildah.spec +++ b/buildah.spec @@ -14,11 +14,11 @@ # https://github.com/projectatomic/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 1ab80bcd88929a94c52268a5af8443c0055a42cb +%global commit0 fbf46d33c4e01199281c7a69e68605ec7d611fd3 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} -Version: 1.0 +Version: 1.1 Release: 1.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -85,6 +85,156 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Sun Jun 10 2018 Dan Walsh 1.1-1 +- Drop capabilities if running container processes as non root +- Print Warning message if cmd will not be used based on entrypoint +- Update 01-intro.md +- Shouldn't add insecure registries to list of search registries +- Report errors on bad transports specification when pushing images +- Move parsing code out of common for namespaces and into pkg/parse.go +- Add disable-content-trust noop flag to bud +- Change freenode chan to buildah +- runCopyStdio(): don't close stdin unless we saw POLLHUP +- Add registry errors for pull +- runCollectOutput(): just read until the pipes are closed on us +- Run(): provide redirection for stdio +- rmi, rm: add test +- add mount test +- Add parameter judgment for commands that do not require parameters +- Add context dir to bud command in baseline test +- run.bats: check that we can run with symlinks in the bundle path +- Give better messages to users when image can not be found +- use absolute path for bundlePath +- Add environment variable to buildah --format +- rm: add validation to args and all option +- Accept json array input for config entrypoint +- Run(): process RunOptions.Mounts, and its flags +- Run(): only collect error output from stdio pipes if we created some +- Add OnBuild support for Dockerfiles +- Quick fix on demo readme +- run: fix validate flags +- buildah bud should require a context directory or URL +- Touchup tutorial for run changes +- Validate common bud and from flags +- images: Error if the specified imagename does not exist +- inspect: Increase err judgments to avoid panic +- add test to inspect +- buildah bud picks up ENV from base image +- Extend the amount of time travis_wait should wait +- Add a make target for Installing CNI plugins +- Add tests for namespace control flags +- copy.bats: check ownerships in the container +- Fix SELinux test errors when SELinux is enabled +- Add example CNI configurations +- Run: set supplemental group IDs +- Run: use a temporary mount namespace +- Use CNI to configure container networks +- add/secrets/commit: Use mappings when setting permissions on added content +- Add CLI options for specifying namespace and cgroup setup +- Always set mappings when using user namespaces +- Run(): break out creation of stdio pipe descriptors +- Read UID/GID mapping information from containers and images +- Additional bud CI tests +- Run integration tests under travis_wait in Travis +- build-using-dockerfile: add --annotation +- Implement --squash for build-using-dockerfile and commit +- Vendor in latest container/storage for devicemapper support +- add test to inspect +- Vendor github.com/onsi/ginkgo and github.com/onsi/gomega +- Test with Go 1.10, too +- Add console syntax highlighting to troubleshooting page +- bud.bats: print "$output" before checking its contents +- Manage "Run" containers more closely +- Break Builder.Run()'s "run runc" bits out +- util.ResolveName(): handle completion for tagged/digested image names +- Handle /etc/hosts and /etc/resolv.conf properly in container +- Documentation fixes +- Make it easier to parse our temporary directory as an image name +- Makefile: list new pkg/ subdirectoris as dependencies for buildah +- containerImageSource: return more-correct errors +- API cleanup: PullPolicy and TerminalPolicy should be types +- Make "run --terminal" and "run -t" aliases for "run --tty" +- Vendor github.com/containernetworking/cni v0.6.0 +- Update github.com/containers/storage +- Update github.com/projectatomic/libpod +- Add support for buildah bud --label +- buildah push/from can push and pull images with no reference +- Vendor in latest containers/image +- Update gometalinter to fix install.tools error +- Update troubleshooting with new run workaround +- Added a bud demo and tidied up +- Attempt to download file from url, if fails assume Dockerfile +- Add buildah bud CI tests for ENV variables +- Re-enable rpm .spec version check and new commit test +- Update buildah scratch demo to support el7 +- Added Docker compatibility demo +- Update to F28 and new run format in baseline test +- Touchup man page short options across man pages +- Added demo dir and a demo. chged distrorlease +- builder-inspect: fix format option +- Add cpu-shares short flag (-c) and cpu-shares CI tests +- Minor fixes to formatting in rpm spec changelog +- Fix rpm .spec changelog formatting +- CI tests and minor fix for cache related noop flags +- buildah-from: add effective value to mount propagation + +* Sat Jun 09 2018 Lokesh Mandvekar (Bot) - 1.0-20.gitf449b28 +- autobuilt f449b28 + +* Fri Jun 08 2018 Lokesh Mandvekar (Bot) - 1.0-19.gitc306342 +- autobuilt c306342 + +* Wed Jun 06 2018 Lokesh Mandvekar (Bot) - 1.0-18.gitd3d097b +- autobuilt d3d097b + +* Mon Jun 04 2018 Lokesh Mandvekar (Bot) - 1.0-17.gitf90b6c0 +- autobuilt f90b6c0 + +* Sun Jun 03 2018 Lokesh Mandvekar (Bot) - 1.0-16.git70641ee +- autobuilt 70641ee + +* Sat Jun 02 2018 Lokesh Mandvekar (Bot) - 1.0-15.git03686e5 +- autobuilt 03686e5 + +* Fri Jun 01 2018 Lokesh Mandvekar (Bot) - 1.0-14.git73bfd79 +- autobuilt 73bfd79 + +* Thu May 31 2018 Lokesh Mandvekar (Bot) - 1.0-13.git5595d4d +- autobuilt 5595d4d + +* Wed May 30 2018 Lokesh Mandvekar (Bot) - 1.0-12.gitebb0d8e +- autobuilt ebb0d8e + +* Tue May 29 2018 Lokesh Mandvekar (Bot) - 1.0-11.git88affbd +- autobuilt 88affbd + +* Fri May 25 2018 Lokesh Mandvekar (Bot) - 1.0-10.git25f4e8e +- autobuilt 25f4e8e + +* Thu May 17 2018 Lokesh Mandvekar (Bot) - 1.0-9.git2749191 +- autobuilt 2749191 + +* Wed May 16 2018 Lokesh Mandvekar (Bot) - 1.0-8.git3e320b9 +- autobuilt 3e320b9 + +* Tue May 15 2018 Lokesh Mandvekar (Bot) - 1.0-7.git8515867 +- autobuilt 8515867 + +* Sun May 13 2018 Lokesh Mandvekar (Bot) - 1.0-6.gitce8d467 +- autobuilt ce8d467 + +* Sat May 12 2018 Lokesh Mandvekar (Bot) - 1.0-5.gitb9a1041 +- autobuilt b9a1041 + +* Fri May 11 2018 Lokesh Mandvekar (Bot) - 1.0-4.git2ea3e11 +- autobuilt 2ea3e11 + +* Wed May 09 2018 Lokesh Mandvekar (Bot) - 1.0-3.gitfe204e4 +- autobuilt fe204e4 + +* Tue May 08 2018 Lokesh Mandvekar (Bot) - 1.0-2.git906ee37 +- autobuilt 906ee37 + * Mon May 07 2018 Dan Walsh 1.0-1 - Remove buildah run cmd and entrypoint execution - Add Files section with registries.conf to pertinent man pages diff --git a/sources b/sources index b19b522..70ff20c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-1ab80bc.tar.gz) = c438d8822411bed1156f4dc24ae223f47741991bad5d1250ea59fc8c2dc304080fa67b4900a40cea48ac3f3cbc159e15d4dcc3f310342eb7542dcda05cf5c076 +SHA512 (buildah-fbf46d3.tar.gz) = f2e787c037e277baccc54d22abe98a712b4ccdcdd6d73249e4ad51c3c18111881765b78ff4c774560240bcedb042b204df77775f1d2ff2f97847aee512ef6374 From dfcf64556b0b5e4feb084f840e2ae368406befc7 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 15 Jul 2018 06:16:51 -0400 Subject: [PATCH 06/20] Vendor in latest containers/image build-using-dockerfile: let -t include transports again Block use of /proc/acpi and /proc/keys from inside containers Fix handling of --registries-conf Fix becoming a maintainer link add optional CI test fo darwin Don't pass a nil error to errors.Wrapf() image filter test: use kubernetes/pause as a "since" Add --cidfile option to from vendor: update containers/storage Contributors need to find the CONTRIBUTOR.md file easier Add a --loglevel option to build-with-dockerfile Create Development plan cmd: Code improvement allow buildah cross compile for a darwin target Add unused function param lint check docs: Follow man-pages(7) suggestions for SYNOPSIS Start using github.com/seccomp/containers-golang umount: add all option to umount all mounted containers runConfigureNetwork(): remove an unused parameter Update github.com/opencontainers/selinux Fix buildah bud --layers Force ownership of /etc/hosts and /etc/resolv.conf to 0:0 main: if unprivileged, reexec in a user namespace Vendor in latest imagebuilder Reduce the complexity of the buildah.Run function mount: output it before replacing lastError Vendor in latest selinux-go code Implement basic recognition of the "--isolation" option Run(): try to resolve non-absolute paths using $PATH Run(): don't include any default environment variables build without seccomp vendor in latest runtime-tools bind/mount_unsupported.go: remove import errors Update github.com/opencontainers/runc Add Capabilities lists to BuilderInfo Tweaks for commit tests commit: recognize committing to second storage locations Fix ARGS parsing for run commands Add info on registries.conf to from manpage Switch from using docker to podman for testing in .papr buildah: set the HTTP User-Agent ONBUILD tutorial Add information about the configuration files to the install docs Makefile: add uninstall Add tilde info for push to troubleshooting mount: support multiple inputs Use the right formatting when adding entries to /etc/hosts Vendor in latest go-selinux bindings Allow --userns-uid-map/--userns-gid-map to be global options bind: factor out UnmountMountpoints Run(): simplify runCopyStdio() Run(): handle POLLNVAL results Run(): tweak terminal mode handling Run(): rename 'copyStdio' to 'copyPipes' Run(): don't set a Pdeathsig for the runtime Run(): add options for adding and removing capabilities Run(): don't use a callback when a slice will do setupSeccomp(): refactor Change RunOptions.Stdin/Stdout/Stderr to just be Reader/Writers Escape use of '_' in .md docs Break out getProcIDMappings() Break out SetupIntermediateMountNamespace() Add Multi From Demo Use the c/image conversion code instead of converting configs manually Don't throw away the manifest MIME type and guess again Consolidate loading manifest and config in initConfig Pass a types.Image to Builder.initConfig Require an image ID in importBuilderDataFromImage Use c/image/manifest.GuessMIMEType instead of a custom heuristic Do not ignore any parsing errors in initConfig Explicitly handle "from scratch" images in Builder.initConfig Fix parsing of OCI images Simplify dead but dangerous-looking error handling Don't ignore v2s1 history if docker_version is not set Add --rm and --force-rm to buildah bud Add --all,-a flag to buildah images Separate stdio buffering from writing Remove tty check from images --format Add environment variable BUILDAH_RUNTIME Add --layers and --no-cache to buildah bud Touch up images man version.md: fix DESCRIPTION tests: add containers test tests: add images test images: fix usage fix make clean error Change 'registries' to 'container registries' in man add commit test Add(): learn to record hashes of what we add Minor update to buildah config documentation for entrypoint Add registries.conf link to a few man pages --- .gitignore | 1 + buildah.spec | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 98 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ff298d3..9252952 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /buildah-c306342.tar.gz /buildah-f449b28.tar.gz /buildah-fbf46d3.tar.gz +/buildah-be87762.tar.gz diff --git a/buildah.spec b/buildah.spec index 50cc597..99cba4e 100644 --- a/buildah.spec +++ b/buildah.spec @@ -14,11 +14,11 @@ # https://github.com/projectatomic/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 fbf46d33c4e01199281c7a69e68605ec7d611fd3 +%global commit0 be877622a3b0c7943b3b760ec43c12d177336e4c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} -Version: 1.1 +Version: 1.2 Release: 1.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -85,6 +85,100 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Sun Jul 15 2018 Dan Walsh 1.2-1 +- Vendor in latest containers/image +- build-using-dockerfile: let -t include transports again +- Block use of /proc/acpi and /proc/keys from inside containers +- Fix handling of --registries-conf +- Fix becoming a maintainer link +- add optional CI test fo darwin +- Don't pass a nil error to errors.Wrapf() +- image filter test: use kubernetes/pause as a "since" +- Add --cidfile option to from +- vendor: update containers/storage +- Contributors need to find the CONTRIBUTOR.md file easier +- Add a --loglevel option to build-with-dockerfile +- Create Development plan +- cmd: Code improvement +- allow buildah cross compile for a darwin target +- Add unused function param lint check +- docs: Follow man-pages(7) suggestions for SYNOPSIS +- Start using github.com/seccomp/containers-golang +- umount: add all option to umount all mounted containers +- runConfigureNetwork(): remove an unused parameter +- Update github.com/opencontainers/selinux +- Fix buildah bud --layers +- Force ownership of /etc/hosts and /etc/resolv.conf to 0:0 +- main: if unprivileged, reexec in a user namespace +- Vendor in latest imagebuilder +- Reduce the complexity of the buildah.Run function +- mount: output it before replacing lastError +- Vendor in latest selinux-go code +- Implement basic recognition of the "--isolation" option +- Run(): try to resolve non-absolute paths using $PATH +- Run(): don't include any default environment variables +- build without seccomp +- vendor in latest runtime-tools +- bind/mount_unsupported.go: remove import errors +- Update github.com/opencontainers/runc +- Add Capabilities lists to BuilderInfo +- Tweaks for commit tests +- commit: recognize committing to second storage locations +- Fix ARGS parsing for run commands +- Add info on registries.conf to from manpage +- Switch from using docker to podman for testing in .papr +- buildah: set the HTTP User-Agent +- ONBUILD tutorial +- Add information about the configuration files to the install docs +- Makefile: add uninstall +- Add tilde info for push to troubleshooting +- mount: support multiple inputs +- Use the right formatting when adding entries to /etc/hosts +- Vendor in latest go-selinux bindings +- Allow --userns-uid-map/--userns-gid-map to be global options +- bind: factor out UnmountMountpoints +- Run(): simplify runCopyStdio() +- Run(): handle POLLNVAL results +- Run(): tweak terminal mode handling +- Run(): rename 'copyStdio' to 'copyPipes' +- Run(): don't set a Pdeathsig for the runtime +- Run(): add options for adding and removing capabilities +- Run(): don't use a callback when a slice will do +- setupSeccomp(): refactor +- Change RunOptions.Stdin/Stdout/Stderr to just be Reader/Writers +- Escape use of '_' in .md docs +- Break out getProcIDMappings() +- Break out SetupIntermediateMountNamespace() +- Add Multi From Demo +- Use the c/image conversion code instead of converting configs manually +- Don't throw away the manifest MIME type and guess again +- Consolidate loading manifest and config in initConfig +- Pass a types.Image to Builder.initConfig +- Require an image ID in importBuilderDataFromImage +- Use c/image/manifest.GuessMIMEType instead of a custom heuristic +- Do not ignore any parsing errors in initConfig +- Explicitly handle "from scratch" images in Builder.initConfig +- Fix parsing of OCI images +- Simplify dead but dangerous-looking error handling +- Don't ignore v2s1 history if docker_version is not set +- Add --rm and --force-rm to buildah bud +- Add --all,-a flag to buildah images +- Separate stdio buffering from writing +- Remove tty check from images --format +- Add environment variable BUILDAH_RUNTIME +- Add --layers and --no-cache to buildah bud +- Touch up images man +- version.md: fix DESCRIPTION +- tests: add containers test +- tests: add images test +- images: fix usage +- fix make clean error +- Change 'registries' to 'container registries' in man +- add commit test +- Add(): learn to record hashes of what we add +- Minor update to buildah config documentation for entrypoint +- Add registries.conf link to a few man pages + * Sun Jun 10 2018 Dan Walsh 1.1-1 - Drop capabilities if running container processes as non root - Print Warning message if cmd will not be used based on entrypoint diff --git a/sources b/sources index 70ff20c..800622b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-fbf46d3.tar.gz) = f2e787c037e277baccc54d22abe98a712b4ccdcdd6d73249e4ad51c3c18111881765b78ff4c774560240bcedb042b204df77775f1d2ff2f97847aee512ef6374 +SHA512 (buildah-be87762.tar.gz) = c46fb5fd974c603b6e229cdc79b9f2d1eee011e1b6798cf100af3b625af6508ac51cb4a3a0e92cf46f324e32d6587d7f6faba017c7c4dcd60b9ca1e9028d5326 From 977e968135d024802c1b5bd298182ee45608b2cb Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 15 Jul 2018 07:01:57 -0400 Subject: [PATCH 07/20] Vendor in latest containers/image build-using-dockerfile: let -t include transports again Block use of /proc/acpi and /proc/keys from inside containers Fix handling of --registries-conf Fix becoming a maintainer link add optional CI test fo darwin Don't pass a nil error to errors.Wrapf() image filter test: use kubernetes/pause as a "since" Add --cidfile option to from vendor: update containers/storage Contributors need to find the CONTRIBUTOR.md file easier Add a --loglevel option to build-with-dockerfile Create Development plan cmd: Code improvement allow buildah cross compile for a darwin target Add unused function param lint check docs: Follow man-pages(7) suggestions for SYNOPSIS Start using github.com/seccomp/containers-golang umount: add all option to umount all mounted containers runConfigureNetwork(): remove an unused parameter Update github.com/opencontainers/selinux Fix buildah bud --layers Force ownership of /etc/hosts and /etc/resolv.conf to 0:0 main: if unprivileged, reexec in a user namespace Vendor in latest imagebuilder Reduce the complexity of the buildah.Run function mount: output it before replacing lastError Vendor in latest selinux-go code Implement basic recognition of the "--isolation" option Run(): try to resolve non-absolute paths using $PATH Run(): don't include any default environment variables build without seccomp vendor in latest runtime-tools bind/mount_unsupported.go: remove import errors Update github.com/opencontainers/runc Add Capabilities lists to BuilderInfo Tweaks for commit tests commit: recognize committing to second storage locations Fix ARGS parsing for run commands Add info on registries.conf to from manpage Switch from using docker to podman for testing in .papr buildah: set the HTTP User-Agent ONBUILD tutorial Add information about the configuration files to the install docs Makefile: add uninstall Add tilde info for push to troubleshooting mount: support multiple inputs Use the right formatting when adding entries to /etc/hosts Vendor in latest go-selinux bindings Allow --userns-uid-map/--userns-gid-map to be global options bind: factor out UnmountMountpoints Run(): simplify runCopyStdio() Run(): handle POLLNVAL results Run(): tweak terminal mode handling Run(): rename 'copyStdio' to 'copyPipes' Run(): don't set a Pdeathsig for the runtime Run(): add options for adding and removing capabilities Run(): don't use a callback when a slice will do setupSeccomp(): refactor Change RunOptions.Stdin/Stdout/Stderr to just be Reader/Writers Escape use of '_' in .md docs Break out getProcIDMappings() Break out SetupIntermediateMountNamespace() Add Multi From Demo Use the c/image conversion code instead of converting configs manually Don't throw away the manifest MIME type and guess again Consolidate loading manifest and config in initConfig Pass a types.Image to Builder.initConfig Require an image ID in importBuilderDataFromImage Use c/image/manifest.GuessMIMEType instead of a custom heuristic Do not ignore any parsing errors in initConfig Explicitly handle "from scratch" images in Builder.initConfig Fix parsing of OCI images Simplify dead but dangerous-looking error handling Don't ignore v2s1 history if docker_version is not set Add --rm and --force-rm to buildah bud Add --all,-a flag to buildah images Separate stdio buffering from writing Remove tty check from images --format Add environment variable BUILDAH_RUNTIME Add --layers and --no-cache to buildah bud Touch up images man version.md: fix DESCRIPTION tests: add containers test tests: add images test images: fix usage fix make clean error Change 'registries' to 'container registries' in man add commit test Add(): learn to record hashes of what we add Minor update to buildah config documentation for entrypoint Add registries.conf link to a few man pages --- buildah.spec | 1 + runc.patch | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 runc.patch diff --git a/buildah.spec b/buildah.spec index 99cba4e..f68e385 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,6 +24,7 @@ Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} Source: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +patch: runc.patch ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. diff --git a/runc.patch b/runc.patch new file mode 100644 index 0000000..d098d02 --- /dev/null +++ b/runc.patch @@ -0,0 +1,68 @@ +commit 6bc38cc88392ec7ce52774d36c0b635570aac129 +Author: Daniel J Walsh +Date: Sun Jul 15 06:42:33 2018 -0400 + + Update vendor for runc to fix 32 bit builds + + Current runc builds will not build on 32 bit systems + + Signed-off-by: Daniel J Walsh + +diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go +index 8d353d98..a4ae8901 100644 +--- a/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go ++++ b/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go +@@ -123,8 +123,8 @@ func UIDMapInUserNS(uidmap []user.IDMap) bool { + } + + // GetParentNSeuid returns the euid within the parent user namespace +-func GetParentNSeuid() int { +- euid := os.Geteuid() ++func GetParentNSeuid() int64 { ++ euid := int64(os.Geteuid()) + uidmap, err := user.CurrentProcessUIDMap() + if err != nil { + // This kernel-provided file only exists if user namespaces are supported +diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go +index 37993da8..7b912bbf 100644 +--- a/vendor/github.com/opencontainers/runc/libcontainer/user/user.go ++++ b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go +@@ -78,15 +78,15 @@ func groupFromOS(g *user.Group) (Group, error) { + // SubID represents an entry in /etc/sub{u,g}id + type SubID struct { + Name string +- SubID int +- Count int ++ SubID int64 ++ Count int64 + } + + // IDMap represents an entry in /proc/PID/{u,g}id_map + type IDMap struct { +- ID int +- ParentID int +- Count int ++ ID int64 ++ ParentID int64 ++ Count int64 + } + + func parseLine(line string, v ...interface{}) { +@@ -113,6 +113,8 @@ func parseParts(parts []string, v ...interface{}) { + case *int: + // "numbers", with conversion errors ignored because of some misbehaving configuration files. + *e, _ = strconv.Atoi(p) ++ case *int64: ++ *e, _ = strconv.ParseInt(p, 10, 64) + case *[]string: + // Comma-separated lists. + if p != "" { +@@ -122,7 +124,7 @@ func parseParts(parts []string, v ...interface{}) { + } + default: + // Someone goof'd when writing code using this function. Scream so they can hear us. +- panic(fmt.Sprintf("parseLine only accepts {*string, *int, *[]string} as arguments! %#v is not a pointer!", e)) ++ panic(fmt.Sprintf("parseLine only accepts {*string, *int, *int64, *[]string} as arguments! %#v is not a pointer!", e)) + } + } + } From 7d8e3c31c707860f3c19932176716d7aec0170a4 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 19 Jul 2018 16:42:26 -0400 Subject: [PATCH 08/20] buildah does not require ostree --- buildah.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index f68e385..03886d6 100644 --- a/buildah.spec +++ b/buildah.spec @@ -19,13 +19,12 @@ Name: %{repo} Version: 1.2 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} Source: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz patch: runc.patch - ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -43,7 +42,6 @@ BuildRequires: make Requires: runc >= 1.0.0-17 Requires: skopeo-containers >= 0.1.20-2 Requires: container-selinux -Requires: ostree %description The %{name} package provides a command line tool which can be used to @@ -86,6 +84,9 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Thu Jul 19 2018 Dan Walsh - 1.2-2 +- buildah does not require ostree + * Sun Jul 15 2018 Dan Walsh 1.2-1 - Vendor in latest containers/image - build-using-dockerfile: let -t include transports again From 4e8d13219dccf00ef2516a960c3803ef019d4bb3 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 23 Jul 2018 15:11:42 -0400 Subject: [PATCH 09/20] Change container-selinux Requires to Recommends --- buildah.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/buildah.spec b/buildah.spec index 03886d6..6268449 100644 --- a/buildah.spec +++ b/buildah.spec @@ -19,7 +19,7 @@ Name: %{repo} Version: 1.2 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -40,8 +40,8 @@ BuildRequires: btrfs-progs-devel BuildRequires: libassuan-devel BuildRequires: make Requires: runc >= 1.0.0-17 -Requires: skopeo-containers >= 0.1.20-2 -Requires: container-selinux +Requires: containers-common +Recommends: container-selinux %description The %{name} package provides a command line tool which can be used to @@ -84,6 +84,9 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Mon Jul 23 2018 Dan Walsh - 1.2-3 +- Change container-selinux Requires to Recommends + * Thu Jul 19 2018 Dan Walsh - 1.2-2 - buildah does not require ostree From aab870d77bf198d161687dd111b7853b1baa2f3d Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 5 Aug 2018 07:19:46 -0400 Subject: [PATCH 10/20] Bump to v1.3 Vendor in lates containers/image build-using-dockerfile: let -t include transports again Block use of /proc/acpi and /proc/keys from inside containers Fix handling of --registries-conf Fix becoming a maintainer link add optional CI test fo darwin Don't pass a nil error to errors.Wrapf() image filter test: use kubernetes/pause as a "since" Add --cidfile option to from vendor: update containers/storage Contributors need to find the CONTRIBUTOR.md file easier Add a --loglevel option to build-with-dockerfile Create Development plan cmd: Code improvement allow buildah cross compile for a darwin target Add unused function param lint check docs: Follow man-pages(7) suggestions for SYNOPSIS Start using github.com/seccomp/containers-golang umount: add all option to umount all mounted containers runConfigureNetwork(): remove an unused parameter Update github.com/opencontainers/selinux Fix buildah bud --layers Force ownership of /etc/hosts and /etc/resolv.conf to 0:0 main: if unprivileged, reexec in a user namespace Vendor in latest imagebuilder Reduce the complexity of the buildah.Run function mount: output it before replacing lastError Vendor in latest selinux-go code Implement basic recognition of the "--isolation" option Run(): try to resolve non-absolute paths using $PATH Run(): don't include any default environment variables build without seccomp vendor in latest runtime-tools bind/mount_unsupported.go: remove import errors Update github.com/opencontainers/runc Add Capabilities lists to BuilderInfo Tweaks for commit tests commit: recognize committing to second storage locations Fix ARGS parsing for run commands Add info on registries.conf to from manpage Switch from using docker to podman for testing in .papr buildah: set the HTTP User-Agent ONBUILD tutorial Add information about the configuration files to the install docs Makefile: add uninstall Add tilde info for push to troubleshooting mount: support multiple inputs Use the right formatting when adding entries to /etc/hosts Vendor in latest go-selinux bindings Allow --userns-uid-map/--userns-gid-map to be global options bind: factor out UnmountMountpoints Run(): simplify runCopyStdio() Run(): handle POLLNVAL results Run(): tweak terminal mode handling Run(): rename 'copyStdio' to 'copyPipes' Run(): don't set a Pdeathsig for the runtime Run(): add options for adding and removing capabilities Run(): don't use a callback when a slice will do setupSeccomp(): refactor Change RunOptions.Stdin/Stdout/Stderr to just be Reader/Writers Escape use of '_' in .md docs Break out getProcIDMappings() Break out SetupIntermediateMountNamespace() Add Multi From Demo Use the c/image conversion code instead of converting configs manually Don't throw away the manifest MIME type and guess again Consolidate loading manifest and config in initConfig Pass a types.Image to Builder.initConfig Require an image ID in importBuilderDataFromImage Use c/image/manifest.GuessMIMEType instead of a custom heuristic Do not ignore any parsing errors in initConfig Explicitly handle "from scratch" images in Builder.initConfig Fix parsing of OCI images Simplify dead but dangerous-looking error handling Don't ignore v2s1 history if docker_version is not set Add --rm and --force-rm to buildah bud Add --all,-a flag to buildah images Separate stdio buffering from writing Remove tty check from images --format Add environment variable BUILDAH_RUNTIME Add --layers and --no-cache to buildah bud Touch up images man version.md: fix DESCRIPTION tests: add containers test tests: add images test images: fix usage fix make clean error Change 'registries' to 'container registries' in man add commit test Add(): learn to record hashes of what we add Minor update to buildah config documentation for entrypoint Bump to v1.2-dev Add registries.conf link to a few man pages --- .gitignore | 1 + buildah.spec | 103 +++++++++++++++++++++++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 102 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9252952..4ec998d 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /buildah-f449b28.tar.gz /buildah-fbf46d3.tar.gz /buildah-be87762.tar.gz +/buildah-4888163.tar.gz diff --git a/buildah.spec b/buildah.spec index 6268449..dccf180 100644 --- a/buildah.spec +++ b/buildah.spec @@ -14,12 +14,12 @@ # https://github.com/projectatomic/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 be877622a3b0c7943b3b760ec43c12d177336e4c +%global commit0 4888163cf12b4e0c0d32ef7eb0ed941c2c81d4f7 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} -Version: 1.2 -Release: 3.git%{shortcommit0}%{?dist} +Version: 1.3 +Release: 1.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -84,6 +84,103 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Sun Aug 5 2018 Dan Walsh - 1.3-1 +- Bump to v1.3 +- Vendor in lates containers/image +- build-using-dockerfile: let -t include transports again +- Block use of /proc/acpi and /proc/keys from inside containers +- Fix handling of --registries-conf +- Fix becoming a maintainer link +- add optional CI test fo darwin +- Don't pass a nil error to errors.Wrapf() +- image filter test: use kubernetes/pause as a "since" +- Add --cidfile option to from +- vendor: update containers/storage +- Contributors need to find the CONTRIBUTOR.md file easier +- Add a --loglevel option to build-with-dockerfile +- Create Development plan +- cmd: Code improvement +- allow buildah cross compile for a darwin target +- Add unused function param lint check +- docs: Follow man-pages(7) suggestions for SYNOPSIS +- Start using github.com/seccomp/containers-golang +- umount: add all option to umount all mounted containers +- runConfigureNetwork(): remove an unused parameter +- Update github.com/opencontainers/selinux +- Fix buildah bud --layers +- Force ownership of /etc/hosts and /etc/resolv.conf to 0:0 +- main: if unprivileged, reexec in a user namespace +- Vendor in latest imagebuilder +- Reduce the complexity of the buildah.Run function +- mount: output it before replacing lastError +- Vendor in latest selinux-go code +- Implement basic recognition of the "--isolation" option +- Run(): try to resolve non-absolute paths using $PATH +- Run(): don't include any default environment variables +- build without seccomp +- vendor in latest runtime-tools +- bind/mount_unsupported.go: remove import errors +- Update github.com/opencontainers/runc +- Add Capabilities lists to BuilderInfo +- Tweaks for commit tests +- commit: recognize committing to second storage locations +- Fix ARGS parsing for run commands +- Add info on registries.conf to from manpage +- Switch from using docker to podman for testing in .papr +- buildah: set the HTTP User-Agent +- ONBUILD tutorial +- Add information about the configuration files to the install docs +- Makefile: add uninstall +- Add tilde info for push to troubleshooting +- mount: support multiple inputs +- Use the right formatting when adding entries to /etc/hosts +- Vendor in latest go-selinux bindings +- Allow --userns-uid-map/--userns-gid-map to be global options +- bind: factor out UnmountMountpoints +- Run(): simplify runCopyStdio() +- Run(): handle POLLNVAL results +- Run(): tweak terminal mode handling +- Run(): rename 'copyStdio' to 'copyPipes' +- Run(): don't set a Pdeathsig for the runtime +- Run(): add options for adding and removing capabilities +- Run(): don't use a callback when a slice will do +- setupSeccomp(): refactor +- Change RunOptions.Stdin/Stdout/Stderr to just be Reader/Writers +- Escape use of '_' in .md docs +- Break out getProcIDMappings() +- Break out SetupIntermediateMountNamespace() +- Add Multi From Demo +- Use the c/image conversion code instead of converting configs manually +- Don't throw away the manifest MIME type and guess again +- Consolidate loading manifest and config in initConfig +- Pass a types.Image to Builder.initConfig +- Require an image ID in importBuilderDataFromImage +- Use c/image/manifest.GuessMIMEType instead of a custom heuristic +- Do not ignore any parsing errors in initConfig +- Explicitly handle "from scratch" images in Builder.initConfig +- Fix parsing of OCI images +- Simplify dead but dangerous-looking error handling +- Don't ignore v2s1 history if docker_version is not set +- Add --rm and --force-rm to buildah bud +- Add --all,-a flag to buildah images +- Separate stdio buffering from writing +- Remove tty check from images --format +- Add environment variable BUILDAH_RUNTIME +- Add --layers and --no-cache to buildah bud +- Touch up images man +- version.md: fix DESCRIPTION +- tests: add containers test +- tests: add images test +- images: fix usage +- fix make clean error +- Change 'registries' to 'container registries' in man +- add commit test +- Add(): learn to record hashes of what we add +- Minor update to buildah config documentation for entrypoint +- Bump to v1.2-dev +- Add registries.conf link to a few man pages + + * Mon Jul 23 2018 Dan Walsh - 1.2-3 - Change container-selinux Requires to Recommends diff --git a/sources b/sources index 800622b..08a17cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-be87762.tar.gz) = c46fb5fd974c603b6e229cdc79b9f2d1eee011e1b6798cf100af3b625af6508ac51cb4a3a0e92cf46f324e32d6587d7f6faba017c7c4dcd60b9ca1e9028d5326 +SHA512 (buildah-4888163.tar.gz) = cc1ce68839244f4d538335278182a561e1200d2a83040b6d4f4ad22b9295b099fc0b354815f6498e8e398a1252f0fe75e427a60a57ab1b56ac60da24b482e3eb From 430c7a0285af77ab4a462568cb07f9f8f0c83cf2 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 5 Aug 2018 07:27:16 -0400 Subject: [PATCH 11/20] Bump to v1.3 Vendor in lates containers/image build-using-dockerfile: let -t include transports again Block use of /proc/acpi and /proc/keys from inside containers Fix handling of --registries-conf Fix becoming a maintainer link add optional CI test fo darwin Don't pass a nil error to errors.Wrapf() image filter test: use kubernetes/pause as a "since" Add --cidfile option to from vendor: update containers/storage Contributors need to find the CONTRIBUTOR.md file easier Add a --loglevel option to build-with-dockerfile Create Development plan cmd: Code improvement allow buildah cross compile for a darwin target Add unused function param lint check docs: Follow man-pages(7) suggestions for SYNOPSIS Start using github.com/seccomp/containers-golang umount: add all option to umount all mounted containers runConfigureNetwork(): remove an unused parameter Update github.com/opencontainers/selinux Fix buildah bud --layers Force ownership of /etc/hosts and /etc/resolv.conf to 0:0 main: if unprivileged, reexec in a user namespace Vendor in latest imagebuilder Reduce the complexity of the buildah.Run function mount: output it before replacing lastError Vendor in latest selinux-go code Implement basic recognition of the "--isolation" option Run(): try to resolve non-absolute paths using $PATH Run(): don't include any default environment variables build without seccomp vendor in latest runtime-tools bind/mount_unsupported.go: remove import errors Update github.com/opencontainers/runc Add Capabilities lists to BuilderInfo Tweaks for commit tests commit: recognize committing to second storage locations Fix ARGS parsing for run commands Add info on registries.conf to from manpage Switch from using docker to podman for testing in .papr buildah: set the HTTP User-Agent ONBUILD tutorial Add information about the configuration files to the install docs Makefile: add uninstall Add tilde info for push to troubleshooting mount: support multiple inputs Use the right formatting when adding entries to /etc/hosts Vendor in latest go-selinux bindings Allow --userns-uid-map/--userns-gid-map to be global options bind: factor out UnmountMountpoints Run(): simplify runCopyStdio() Run(): handle POLLNVAL results Run(): tweak terminal mode handling Run(): rename 'copyStdio' to 'copyPipes' Run(): don't set a Pdeathsig for the runtime Run(): add options for adding and removing capabilities Run(): don't use a callback when a slice will do setupSeccomp(): refactor Change RunOptions.Stdin/Stdout/Stderr to just be Reader/Writers Escape use of '_' in .md docs Break out getProcIDMappings() Break out SetupIntermediateMountNamespace() Add Multi From Demo Use the c/image conversion code instead of converting configs manually Don't throw away the manifest MIME type and guess again Consolidate loading manifest and config in initConfig Pass a types.Image to Builder.initConfig Require an image ID in importBuilderDataFromImage Use c/image/manifest.GuessMIMEType instead of a custom heuristic Do not ignore any parsing errors in initConfig Explicitly handle "from scratch" images in Builder.initConfig Fix parsing of OCI images Simplify dead but dangerous-looking error handling Don't ignore v2s1 history if docker_version is not set Add --rm and --force-rm to buildah bud Add --all,-a flag to buildah images Separate stdio buffering from writing Remove tty check from images --format Add environment variable BUILDAH_RUNTIME Add --layers and --no-cache to buildah bud Touch up images man version.md: fix DESCRIPTION tests: add containers test tests: add images test images: fix usage fix make clean error Change 'registries' to 'container registries' in man add commit test Add(): learn to record hashes of what we add Minor update to buildah config documentation for entrypoint Bump to v1.2-dev Add registries.conf link to a few man pages --- buildah.spec | 2 -- runc.patch | 68 ---------------------------------------------------- 2 files changed, 70 deletions(-) delete mode 100644 runc.patch diff --git a/buildah.spec b/buildah.spec index dccf180..ab4d64c 100644 --- a/buildah.spec +++ b/buildah.spec @@ -24,7 +24,6 @@ Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} Source: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz -patch: runc.patch ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -180,7 +179,6 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions - Bump to v1.2-dev - Add registries.conf link to a few man pages - * Mon Jul 23 2018 Dan Walsh - 1.2-3 - Change container-selinux Requires to Recommends diff --git a/runc.patch b/runc.patch deleted file mode 100644 index d098d02..0000000 --- a/runc.patch +++ /dev/null @@ -1,68 +0,0 @@ -commit 6bc38cc88392ec7ce52774d36c0b635570aac129 -Author: Daniel J Walsh -Date: Sun Jul 15 06:42:33 2018 -0400 - - Update vendor for runc to fix 32 bit builds - - Current runc builds will not build on 32 bit systems - - Signed-off-by: Daniel J Walsh - -diff --git a/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go b/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go -index 8d353d98..a4ae8901 100644 ---- a/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go -+++ b/vendor/github.com/opencontainers/runc/libcontainer/system/linux.go -@@ -123,8 +123,8 @@ func UIDMapInUserNS(uidmap []user.IDMap) bool { - } - - // GetParentNSeuid returns the euid within the parent user namespace --func GetParentNSeuid() int { -- euid := os.Geteuid() -+func GetParentNSeuid() int64 { -+ euid := int64(os.Geteuid()) - uidmap, err := user.CurrentProcessUIDMap() - if err != nil { - // This kernel-provided file only exists if user namespaces are supported -diff --git a/vendor/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go -index 37993da8..7b912bbf 100644 ---- a/vendor/github.com/opencontainers/runc/libcontainer/user/user.go -+++ b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go -@@ -78,15 +78,15 @@ func groupFromOS(g *user.Group) (Group, error) { - // SubID represents an entry in /etc/sub{u,g}id - type SubID struct { - Name string -- SubID int -- Count int -+ SubID int64 -+ Count int64 - } - - // IDMap represents an entry in /proc/PID/{u,g}id_map - type IDMap struct { -- ID int -- ParentID int -- Count int -+ ID int64 -+ ParentID int64 -+ Count int64 - } - - func parseLine(line string, v ...interface{}) { -@@ -113,6 +113,8 @@ func parseParts(parts []string, v ...interface{}) { - case *int: - // "numbers", with conversion errors ignored because of some misbehaving configuration files. - *e, _ = strconv.Atoi(p) -+ case *int64: -+ *e, _ = strconv.ParseInt(p, 10, 64) - case *[]string: - // Comma-separated lists. - if p != "" { -@@ -122,7 +124,7 @@ func parseParts(parts []string, v ...interface{}) { - } - default: - // Someone goof'd when writing code using this function. Scream so they can hear us. -- panic(fmt.Sprintf("parseLine only accepts {*string, *int, *[]string} as arguments! %#v is not a pointer!", e)) -+ panic(fmt.Sprintf("parseLine only accepts {*string, *int, *int64, *[]string} as arguments! %#v is not a pointer!", e)) - } - } - } From 4ee64e79b6a39ed9fba6e8722a20e64d0afbefdd Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 2 Oct 2018 15:36:31 -0400 Subject: [PATCH 12/20] bump to v1.4 Release --- buildah.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/buildah.spec b/buildah.spec index ab4d64c..e65e7de 100644 --- a/buildah.spec +++ b/buildah.spec @@ -9,16 +9,16 @@ %global provider github %global provider_tld com -%global project projectatomic +%global project containers %global repo buildah -# https://github.com/projectatomic/buildah +# https://github.com/containers/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 4888163cf12b4e0c0d32ef7eb0ed941c2c81d4f7 +%global commit0 87239ae7046ea3a25f644cd0789b3d6678dc144d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} -Version: 1.3 +Version: 1.4 Release: 1.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 @@ -83,6 +83,9 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Tue Oct 2 2018 Dan Walsh - 1.4-2.git87239ae +- bump to v1.4 Release + * Sun Aug 5 2018 Dan Walsh - 1.3-1 - Bump to v1.3 - Vendor in lates containers/image From 0494726d25dcac0abf106a7f77784d566da32690 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 2 Oct 2018 15:39:54 -0400 Subject: [PATCH 13/20] bump to v1.4 Release --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 08a17cb..e777f0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-4888163.tar.gz) = cc1ce68839244f4d538335278182a561e1200d2a83040b6d4f4ad22b9295b099fc0b354815f6498e8e398a1252f0fe75e427a60a57ab1b56ac60da24b482e3eb +SHA512 (buildah-87239ae.tar.gz) = c998e1baf3f6169ae6309c98f1c40fde8bf87d600f4795cad786a4c1bea213f98e6f877f14c9fd9e305cfc0b2b1d524f716687c137826b6a49f3e8b32b6b8d6c From ff14f3c53c0e2662b889700ca2366d1e923b05ab Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 3 Oct 2018 07:42:52 -0400 Subject: [PATCH 14/20] bump to v1.4 Release --- buildah.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildah.spec b/buildah.spec index e65e7de..6bf1f05 100644 --- a/buildah.spec +++ b/buildah.spec @@ -19,7 +19,7 @@ Name: %{repo} Version: 1.4 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} From 69f20675266349fcf857d34c004725ec528c7bd5 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 4 Oct 2018 12:36:28 -0400 Subject: [PATCH 15/20] Fix v1.4 Release --- .gitignore | 37 +++++++++++++++++++++++++++++++++++-- buildah.spec | 7 +++++-- sources | 2 +- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4ec998d..5ab4b1e 100644 --- a/.gitignore +++ b/.gitignore @@ -56,5 +56,38 @@ /buildah-c306342.tar.gz /buildah-f449b28.tar.gz /buildah-fbf46d3.tar.gz -/buildah-be87762.tar.gz -/buildah-4888163.tar.gz +/buildah-b9983a6.tar.gz +/buildah-94c1e6d.tar.gz +/buildah-6c4bef7.tar.gz +/buildah-73820fc.tar.gz +/buildah-fc438bb.tar.gz +/buildah-93d8606.tar.gz +/buildah-2064b29.tar.gz +/buildah-da7be32.tar.gz +/buildah-2441ff4.tar.gz +/buildah-0143a44.tar.gz +/buildah-2ac95ea.tar.gz +/buildah-16a33bd.tar.gz +/buildah-146c185.tar.gz +/buildah-1acccce.tar.gz +/buildah-b965fc4.tar.gz +/buildah-704adec.tar.gz +/buildah-6f72599.tar.gz +/buildah-5cd9be6.tar.gz +/buildah-5c11c34.tar.gz +/buildah-a59fb7a.tar.gz +/buildah-733cd20.tar.gz +/buildah-a885bc6.tar.gz +/buildah-8be2b62.tar.gz +/buildah-3fb864b.tar.gz +/buildah-a9895bd.tar.gz +/buildah-1215b16.tar.gz +/buildah-826733a.tar.gz +/buildah-e5f7539.tar.gz +/buildah-4976d8c.tar.gz +/buildah-c18724e.tar.gz +/buildah-be03809.tar.gz +/buildah-02f54e4.tar.gz +/buildah-0a7389c.tar.gz +/buildah-87239ae.tar.gz +/buildah-608fa84.tar.gz diff --git a/buildah.spec b/buildah.spec index 6bf1f05..2d12746 100644 --- a/buildah.spec +++ b/buildah.spec @@ -14,12 +14,12 @@ # https://github.com/containers/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 87239ae7046ea3a25f644cd0789b3d6678dc144d +%global commit0 608fa843cce45e7ee58ccb71a90297b645a984d3 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} Version: 1.4 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -83,6 +83,9 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Thu Oct 4 2018 Dan Walsh - 1.4-3.git608fa84 +- Fix v1.4 Release + * Tue Oct 2 2018 Dan Walsh - 1.4-2.git87239ae - bump to v1.4 Release diff --git a/sources b/sources index e777f0e..c08a957 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-87239ae.tar.gz) = c998e1baf3f6169ae6309c98f1c40fde8bf87d600f4795cad786a4c1bea213f98e6f877f14c9fd9e305cfc0b2b1d524f716687c137826b6a49f3e8b32b6b8d6c +SHA512 (buildah-608fa84.tar.gz) = 54752ca0ebcef7be5e24ae326d2a467a489ed9171f6de1f572dd981b4a902ac0def773280e75f05787be786f43a1ae237e4c769ba168bff87ba25fa13389d4aa From 30b71f84bbf89e59eeff22673938765841633760 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 22 Nov 2018 11:17:26 -0500 Subject: [PATCH 16/20] bump to v1.5-dev Release --- .gitignore | 1 - buildah.spec | 322 +++++++++++++++++++-------------------------------- sources | 2 +- 3 files changed, 123 insertions(+), 202 deletions(-) diff --git a/.gitignore b/.gitignore index 5ab4b1e..189b1c5 100644 --- a/.gitignore +++ b/.gitignore @@ -90,4 +90,3 @@ /buildah-02f54e4.tar.gz /buildah-0a7389c.tar.gz /buildah-87239ae.tar.gz -/buildah-608fa84.tar.gz diff --git a/buildah.spec b/buildah.spec index 2d12746..d25bb85 100644 --- a/buildah.spec +++ b/buildah.spec @@ -1,7 +1,8 @@ -%global with_debug 1 %global with_bundled 1 +%global with_debug 1 %if 0%{?with_debug} +%global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 %else %global debug_package %{nil} @@ -14,22 +15,23 @@ # https://github.com/containers/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 608fa843cce45e7ee58ccb71a90297b645a984d3 +%global commit0 87239ae7046ea3a25f644cd0789b3d6678dc144d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} -Version: 1.4 -Release: 3.git%{shortcommit0}%{?dist} +Version: 1.5 +Release: 1.dev.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} Source: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz + ExclusiveArch: x86_64 %{arm} aarch64 ppc64le s390x # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: git BuildRequires: glib2-devel -BuildRequires: libseccomp-devel +BuildRequires: libseccomp-static BuildRequires: ostree-devel BuildRequires: glibc-static BuildRequires: go-md2man @@ -64,7 +66,9 @@ popd mv vendor src export GOPATH=$(pwd)/_build:$(pwd):%{gopath} -make all GIT_COMMIT=%{shortcommit0} +export BUILDTAGS='seccomp' +%gobuild -o %{name} %{import_path}/cmd/%{name} +%{__make} docs %install export GOPATH=$(pwd)/_build:$(pwd):%{gopath} @@ -83,207 +87,125 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog -* Thu Oct 4 2018 Dan Walsh - 1.4-3.git608fa84 -- Fix v1.4 Release +* Tue Oct 2 2018 Dan Walsh - 1.5-1.dev.git87239ae +- bump to v1.5-dev Release -* Tue Oct 2 2018 Dan Walsh - 1.4-2.git87239ae -- bump to v1.4 Release +* Wed Sep 19 2018 Lokesh Mandvekar - 1.4-2.dev.git19e44f0 +- autobuilt 19e44f0 -* Sun Aug 5 2018 Dan Walsh - 1.3-1 -- Bump to v1.3 -- Vendor in lates containers/image -- build-using-dockerfile: let -t include transports again -- Block use of /proc/acpi and /proc/keys from inside containers -- Fix handling of --registries-conf -- Fix becoming a maintainer link -- add optional CI test fo darwin -- Don't pass a nil error to errors.Wrapf() -- image filter test: use kubernetes/pause as a "since" -- Add --cidfile option to from -- vendor: update containers/storage -- Contributors need to find the CONTRIBUTOR.md file easier -- Add a --loglevel option to build-with-dockerfile -- Create Development plan -- cmd: Code improvement -- allow buildah cross compile for a darwin target -- Add unused function param lint check -- docs: Follow man-pages(7) suggestions for SYNOPSIS -- Start using github.com/seccomp/containers-golang -- umount: add all option to umount all mounted containers -- runConfigureNetwork(): remove an unused parameter -- Update github.com/opencontainers/selinux -- Fix buildah bud --layers -- Force ownership of /etc/hosts and /etc/resolv.conf to 0:0 -- main: if unprivileged, reexec in a user namespace -- Vendor in latest imagebuilder -- Reduce the complexity of the buildah.Run function -- mount: output it before replacing lastError -- Vendor in latest selinux-go code -- Implement basic recognition of the "--isolation" option -- Run(): try to resolve non-absolute paths using $PATH -- Run(): don't include any default environment variables -- build without seccomp -- vendor in latest runtime-tools -- bind/mount_unsupported.go: remove import errors -- Update github.com/opencontainers/runc -- Add Capabilities lists to BuilderInfo -- Tweaks for commit tests -- commit: recognize committing to second storage locations -- Fix ARGS parsing for run commands -- Add info on registries.conf to from manpage -- Switch from using docker to podman for testing in .papr -- buildah: set the HTTP User-Agent -- ONBUILD tutorial -- Add information about the configuration files to the install docs -- Makefile: add uninstall -- Add tilde info for push to troubleshooting -- mount: support multiple inputs -- Use the right formatting when adding entries to /etc/hosts -- Vendor in latest go-selinux bindings -- Allow --userns-uid-map/--userns-gid-map to be global options -- bind: factor out UnmountMountpoints -- Run(): simplify runCopyStdio() -- Run(): handle POLLNVAL results -- Run(): tweak terminal mode handling -- Run(): rename 'copyStdio' to 'copyPipes' -- Run(): don't set a Pdeathsig for the runtime -- Run(): add options for adding and removing capabilities -- Run(): don't use a callback when a slice will do -- setupSeccomp(): refactor -- Change RunOptions.Stdin/Stdout/Stderr to just be Reader/Writers -- Escape use of '_' in .md docs -- Break out getProcIDMappings() -- Break out SetupIntermediateMountNamespace() -- Add Multi From Demo -- Use the c/image conversion code instead of converting configs manually -- Don't throw away the manifest MIME type and guess again -- Consolidate loading manifest and config in initConfig -- Pass a types.Image to Builder.initConfig -- Require an image ID in importBuilderDataFromImage -- Use c/image/manifest.GuessMIMEType instead of a custom heuristic -- Do not ignore any parsing errors in initConfig -- Explicitly handle "from scratch" images in Builder.initConfig -- Fix parsing of OCI images -- Simplify dead but dangerous-looking error handling -- Don't ignore v2s1 history if docker_version is not set -- Add --rm and --force-rm to buildah bud -- Add --all,-a flag to buildah images -- Separate stdio buffering from writing -- Remove tty check from images --format -- Add environment variable BUILDAH_RUNTIME -- Add --layers and --no-cache to buildah bud -- Touch up images man -- version.md: fix DESCRIPTION -- tests: add containers test -- tests: add images test -- images: fix usage -- fix make clean error -- Change 'registries' to 'container registries' in man -- add commit test -- Add(): learn to record hashes of what we add -- Minor update to buildah config documentation for entrypoint -- Bump to v1.2-dev -- Add registries.conf link to a few man pages +* Sun Aug 12 2018 Lokesh Mandvekar - 1.4-1.dev.git0a7389c +- bump to v1.4-dev +- built 0a7389c -* Mon Jul 23 2018 Dan Walsh - 1.2-3 +* Wed Aug 01 2018 Lokesh Mandvekar (Bot) - 1.3-11.dev.git02f54e4 +- autobuilt 02f54e4 + +* Tue Jul 31 2018 Florian Weimer - 1.3-10.dev.gitbe03809 +- Rebuild with fixed binutils + +* Sun Jul 29 2018 Lokesh Mandvekar (Bot) - 1.3-9.dev.gitbe03809 +- autobuilt be03809 + +* Sat Jul 28 2018 Lokesh Mandvekar (Bot) - 1.3-8.dev.gitc18724e +- autobuilt c18724e + +* Thu Jul 26 2018 Lokesh Mandvekar (Bot) - 1.3-7.dev.git4976d8c +- autobuilt 4976d8c + +* Wed Jul 25 2018 Lokesh Mandvekar (Bot) - 1.3-6.dev.gite5f7539 +- autobuilt e5f7539 + +* Mon Jul 23 2018 Dan Walsh - 1.3-5.dev.dev.git826733a - Change container-selinux Requires to Recommends -* Thu Jul 19 2018 Dan Walsh - 1.2-2 +* Fri Jul 20 2018 Lokesh Mandvekar (Bot) - 1.3-4.dev.git826733a +- autobuilt 826733a + +* Thu Jul 19 2018 Dan Walsh - 1.3-3.dev.git1215b16 - buildah does not require ostree -* Sun Jul 15 2018 Dan Walsh 1.2-1 -- Vendor in latest containers/image -- build-using-dockerfile: let -t include transports again -- Block use of /proc/acpi and /proc/keys from inside containers -- Fix handling of --registries-conf -- Fix becoming a maintainer link -- add optional CI test fo darwin -- Don't pass a nil error to errors.Wrapf() -- image filter test: use kubernetes/pause as a "since" -- Add --cidfile option to from -- vendor: update containers/storage -- Contributors need to find the CONTRIBUTOR.md file easier -- Add a --loglevel option to build-with-dockerfile -- Create Development plan -- cmd: Code improvement -- allow buildah cross compile for a darwin target -- Add unused function param lint check -- docs: Follow man-pages(7) suggestions for SYNOPSIS -- Start using github.com/seccomp/containers-golang -- umount: add all option to umount all mounted containers -- runConfigureNetwork(): remove an unused parameter -- Update github.com/opencontainers/selinux -- Fix buildah bud --layers -- Force ownership of /etc/hosts and /etc/resolv.conf to 0:0 -- main: if unprivileged, reexec in a user namespace -- Vendor in latest imagebuilder -- Reduce the complexity of the buildah.Run function -- mount: output it before replacing lastError -- Vendor in latest selinux-go code -- Implement basic recognition of the "--isolation" option -- Run(): try to resolve non-absolute paths using $PATH -- Run(): don't include any default environment variables -- build without seccomp -- vendor in latest runtime-tools -- bind/mount_unsupported.go: remove import errors -- Update github.com/opencontainers/runc -- Add Capabilities lists to BuilderInfo -- Tweaks for commit tests -- commit: recognize committing to second storage locations -- Fix ARGS parsing for run commands -- Add info on registries.conf to from manpage -- Switch from using docker to podman for testing in .papr -- buildah: set the HTTP User-Agent -- ONBUILD tutorial -- Add information about the configuration files to the install docs -- Makefile: add uninstall -- Add tilde info for push to troubleshooting -- mount: support multiple inputs -- Use the right formatting when adding entries to /etc/hosts -- Vendor in latest go-selinux bindings -- Allow --userns-uid-map/--userns-gid-map to be global options -- bind: factor out UnmountMountpoints -- Run(): simplify runCopyStdio() -- Run(): handle POLLNVAL results -- Run(): tweak terminal mode handling -- Run(): rename 'copyStdio' to 'copyPipes' -- Run(): don't set a Pdeathsig for the runtime -- Run(): add options for adding and removing capabilities -- Run(): don't use a callback when a slice will do -- setupSeccomp(): refactor -- Change RunOptions.Stdin/Stdout/Stderr to just be Reader/Writers -- Escape use of '_' in .md docs -- Break out getProcIDMappings() -- Break out SetupIntermediateMountNamespace() -- Add Multi From Demo -- Use the c/image conversion code instead of converting configs manually -- Don't throw away the manifest MIME type and guess again -- Consolidate loading manifest and config in initConfig -- Pass a types.Image to Builder.initConfig -- Require an image ID in importBuilderDataFromImage -- Use c/image/manifest.GuessMIMEType instead of a custom heuristic -- Do not ignore any parsing errors in initConfig -- Explicitly handle "from scratch" images in Builder.initConfig -- Fix parsing of OCI images -- Simplify dead but dangerous-looking error handling -- Don't ignore v2s1 history if docker_version is not set -- Add --rm and --force-rm to buildah bud -- Add --all,-a flag to buildah images -- Separate stdio buffering from writing -- Remove tty check from images --format -- Add environment variable BUILDAH_RUNTIME -- Add --layers and --no-cache to buildah bud -- Touch up images man -- version.md: fix DESCRIPTION -- tests: add containers test -- tests: add images test -- images: fix usage -- fix make clean error -- Change 'registries' to 'container registries' in man -- add commit test -- Add(): learn to record hashes of what we add -- Minor update to buildah config documentation for entrypoint -- Add registries.conf link to a few man pages +* Thu Jul 19 2018 Lokesh Mandvekar (Bot) - 1.3-2.dev.git1215b16 +- autobuilt 1215b16 + +* Tue Jul 17 2018 Lokesh Mandvekar - 1.3-1.dev.gita9895bd +- bump to v1.3-dev +- built a9895bd + +* Thu Jul 12 2018 Fedora Release Engineering - 1.2-25.dev.git3fb864b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 09 2018 Lokesh Mandvekar (Bot) - 1.2-24.git3fb864b +- autobuilt 3fb864b + +* Sun Jul 08 2018 Lokesh Mandvekar (Bot) - 1.2-23.git8be2b62 +- autobuilt 8be2b62 + +* Sat Jul 07 2018 Lokesh Mandvekar (Bot) - 1.2-22.gita885bc6 +- autobuilt a885bc6 + +* Fri Jul 06 2018 Lokesh Mandvekar (Bot) - 1.2-21.git733cd20 +- autobuilt 733cd20 + +* Thu Jul 05 2018 Lokesh Mandvekar (Bot) - 1.2-20.gita59fb7a +- autobuilt a59fb7a + +* Tue Jul 03 2018 Lokesh Mandvekar (Bot) - 1.2-19.git5c11c34 +- autobuilt 5c11c34 + +* Mon Jul 02 2018 Lokesh Mandvekar (Bot) - 1.2-18.git5cd9be6 +- autobuilt 5cd9be6 + +* Sun Jul 01 2018 Lokesh Mandvekar (Bot) - 1.2-17.git6f72599 +- autobuilt 6f72599 + +* Sat Jun 30 2018 Lokesh Mandvekar (Bot) - 1.2-16.git704adec +- autobuilt 704adec + +* Fri Jun 29 2018 Lokesh Mandvekar (Bot) - 1.2-15.gitb965fc4 +- autobuilt b965fc4 + +* Thu Jun 28 2018 Lokesh Mandvekar (Bot) - 1.2-14.git1acccce +- autobuilt 1acccce + +* Wed Jun 27 2018 Lokesh Mandvekar (Bot) - 1.2-13.git146c185 +- autobuilt 146c185 + +* Tue Jun 26 2018 Lokesh Mandvekar (Bot) - 1.2-12.git16a33bd +- autobuilt 16a33bd + +* Mon Jun 25 2018 Lokesh Mandvekar (Bot) - 1.2-11.git2ac95ea +- autobuilt 2ac95ea + +* Sat Jun 23 2018 Lokesh Mandvekar (Bot) - 1.2-10.git0143a44 +- autobuilt 0143a44 + +* Thu Jun 21 2018 Lokesh Mandvekar (Bot) - 1.2-9.git2441ff4 +- autobuilt 2441ff4 + +* Wed Jun 20 2018 Lokesh Mandvekar (Bot) - 1.2-8.gitda7be32 +- autobuilt da7be32 + +* Tue Jun 19 2018 Lokesh Mandvekar (Bot) - 1.2-7.git2064b29 +- autobuilt 2064b29 + +* Mon Jun 18 2018 Lokesh Mandvekar (Bot) - 1.2-6.git93d8606 +- autobuilt 93d8606 + +* Fri Jun 15 2018 Lokesh Mandvekar (Bot) - 1.2-5.gitfc438bb +- autobuilt fc438bb + +* Thu Jun 14 2018 Lokesh Mandvekar (Bot) - 1.2-4.git73820fc +- autobuilt 73820fc + +* Wed Jun 13 2018 Lokesh Mandvekar (Bot) - 1.2-3.git6c4bef7 +- autobuilt 6c4bef7 + +* Tue Jun 12 2018 Lokesh Mandvekar (Bot) - 1.2-2.git94c1e6d +- autobuilt 94c1e6d + +* Mon Jun 11 2018 Lokesh Mandvekar (Bot) - 1.2-1.gitb9983a6 +- bump to 1.2 +- autobuilt b9983a6 * Sun Jun 10 2018 Dan Walsh 1.1-1 - Drop capabilities if running container processes as non root diff --git a/sources b/sources index c08a957..e777f0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-608fa84.tar.gz) = 54752ca0ebcef7be5e24ae326d2a467a489ed9171f6de1f572dd981b4a902ac0def773280e75f05787be786f43a1ae237e4c769ba168bff87ba25fa13389d4aa +SHA512 (buildah-87239ae.tar.gz) = c998e1baf3f6169ae6309c98f1c40fde8bf87d600f4795cad786a4c1bea213f98e6f877f14c9fd9e305cfc0b2b1d524f716687c137826b6a49f3e8b32b6b8d6c From 6200193eac207a07943cb069568849bdc6a2f88b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 22 Nov 2018 11:35:52 -0500 Subject: [PATCH 17/20] bump to v1.5 Release --- buildah.spec | 15 +++++++++------ sources | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/buildah.spec b/buildah.spec index d25bb85..795b13a 100644 --- a/buildah.spec +++ b/buildah.spec @@ -15,12 +15,12 @@ # https://github.com/containers/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 87239ae7046ea3a25f644cd0789b3d6678dc144d +%global commit0 e94b4f98048e7371685731b97eefd6265e2f1fb3 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} Version: 1.5 -Release: 1.dev.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -87,11 +87,14 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog -* Tue Oct 2 2018 Dan Walsh - 1.5-1.dev.git87239ae -- bump to v1.5-dev Release +* Thu Nov 22 2018 Dan Walsh - 1.5-1.gite94b4f98 +- bump to v1.5 Release -* Wed Sep 19 2018 Lokesh Mandvekar - 1.4-2.dev.git19e44f0 -- autobuilt 19e44f0 +* Thu Oct 4 2018 Dan Walsh - 1.4-3.git608fa84 +- Fix v1.4 Release + +* Tue Oct 2 2018 Dan Walsh - 1.4-2.git87239ae +- bump to v1.4 Release * Sun Aug 12 2018 Lokesh Mandvekar - 1.4-1.dev.git0a7389c - bump to v1.4-dev diff --git a/sources b/sources index e777f0e..f134e1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-87239ae.tar.gz) = c998e1baf3f6169ae6309c98f1c40fde8bf87d600f4795cad786a4c1bea213f98e6f877f14c9fd9e305cfc0b2b1d524f716687c137826b6a49f3e8b32b6b8d6c +SHA512 (buildah-e94b4f9.tar.gz) = 760db4d37e4b21efebe0775efe8b675118fb65703ee3f6b26b27a3c6ccd9b4ba76d100eacef2eadbe9081e5fbd93d13f3443ec5f37512ea0b04771836ebfe635 From 2ce96c7d6f2eed2d421d276fe76fce1a6002f01c Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 16 Jan 2019 18:05:22 -0500 Subject: [PATCH 18/20] bump to v1.6 Release --- .gitignore | 3 +++ buildah.spec | 9 ++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 189b1c5..7252a3e 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,6 @@ /buildah-02f54e4.tar.gz /buildah-0a7389c.tar.gz /buildah-87239ae.tar.gz +/buildah-608fa84.tar.gz +/buildah-e94b4f9.tar.gz +/buildah-3ec6a6b.tar.gz diff --git a/buildah.spec b/buildah.spec index 795b13a..d096059 100644 --- a/buildah.spec +++ b/buildah.spec @@ -15,12 +15,12 @@ # https://github.com/containers/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 e94b4f98048e7371685731b97eefd6265e2f1fb3 +%global commit0 3ec6a6bd92fba9cdc999a40fa167633176a8222a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} -Version: 1.5 -Release: 2.git%{shortcommit0}%{?dist} +Version: 1.6 +Release: 1.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -87,6 +87,9 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Wed Jan 16 2019 Dan Walsh - 1.5-1.git3ec6a6bd +- bump to v1.6 Release + * Thu Nov 22 2018 Dan Walsh - 1.5-1.gite94b4f98 - bump to v1.5 Release diff --git a/sources b/sources index f134e1c..3c27ae1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-e94b4f9.tar.gz) = 760db4d37e4b21efebe0775efe8b675118fb65703ee3f6b26b27a3c6ccd9b4ba76d100eacef2eadbe9081e5fbd93d13f3443ec5f37512ea0b04771836ebfe635 +SHA512 (buildah-3ec6a6b.tar.gz) = 340070382775a246fc1b9c94cb6a9384631442b77e8db6e353d62cbd2b1e555cd86dd42fb8594d43dd88c6e78b3fedc089bb2fd7a0291818268334f1cd4a946c From 9b84606f188052f7ffa062c022e72da3798f0322 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 21 Jan 2019 14:04:37 -0500 Subject: [PATCH 19/20] Fixes for v1.6 release --- .gitignore | 1 + buildah.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7252a3e..e18ae81 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ /buildah-608fa84.tar.gz /buildah-e94b4f9.tar.gz /buildah-3ec6a6b.tar.gz +/buildah-5f95bd9.tar.gz diff --git a/buildah.spec b/buildah.spec index d096059..6a9daf1 100644 --- a/buildah.spec +++ b/buildah.spec @@ -15,12 +15,12 @@ # https://github.com/containers/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 3ec6a6bd92fba9cdc999a40fa167633176a8222a +%global commit0 5f95bd9a350a2dcff776914c19192df1cf272b97 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} Version: 1.6 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -87,7 +87,10 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog -* Wed Jan 16 2019 Dan Walsh - 1.5-1.git3ec6a6bd +* Wed Jan 16 2019 Dan Walsh - 1.6-2.git5f95bd9a +- Fixes for v1.6 release + +* Wed Jan 16 2019 Dan Walsh - 1.6-1.git3ec6a6bd - bump to v1.6 Release * Thu Nov 22 2018 Dan Walsh - 1.5-1.gite94b4f98 diff --git a/sources b/sources index 3c27ae1..ae382bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-3ec6a6b.tar.gz) = 340070382775a246fc1b9c94cb6a9384631442b77e8db6e353d62cbd2b1e555cd86dd42fb8594d43dd88c6e78b3fedc089bb2fd7a0291818268334f1cd4a946c +SHA512 (buildah-5f95bd9.tar.gz) = c5fcd65e7917838f1e4c2e1b6de87862440ae63b485d9e936d26561e9689274589ba54e2e9184e131d9b3bf7a475fbe9d78537f501e6f69b2caa620965f1d71c From 52815a57bed25ecb7fd3750ad46738c25a3745d8 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 21 Feb 2019 15:24:44 -0500 Subject: [PATCH 20/20] bump to v1.7 Release --- .gitignore | 1 + buildah.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e18ae81..910dd6e 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ /buildah-e94b4f9.tar.gz /buildah-3ec6a6b.tar.gz /buildah-5f95bd9.tar.gz +/buildah-873f001.tar.gz diff --git a/buildah.spec b/buildah.spec index 6a9daf1..66c75ac 100644 --- a/buildah.spec +++ b/buildah.spec @@ -15,12 +15,12 @@ # https://github.com/containers/buildah %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 5f95bd9a350a2dcff776914c19192df1cf272b97 +%global commit0 873f00141c8e23973709f6226972d5976f8eb975 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} -Version: 1.6 -Release: 2.git%{shortcommit0}%{?dist} +Version: 1.7 +Release: 1.git%{shortcommit0}%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{provider_prefix} @@ -87,6 +87,9 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Thu Feb 21 2019 Dan Walsh - 1.6-2.git873f0014 +- bump to v1.7 Release + * Wed Jan 16 2019 Dan Walsh - 1.6-2.git5f95bd9a - Fixes for v1.6 release diff --git a/sources b/sources index ae382bc..16d5acc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-5f95bd9.tar.gz) = c5fcd65e7917838f1e4c2e1b6de87862440ae63b485d9e936d26561e9689274589ba54e2e9184e131d9b3bf7a475fbe9d78537f501e6f69b2caa620965f1d71c +SHA512 (buildah-873f001.tar.gz) = 737f01a3e1e8f39d58f5862c1ed0227e5ce25f3828b4acca220d4beab4a31b84c415163ef2e8fa41b4e961f1f8bb45a4e9905e3dddf57144ce04a9031d83e98f