diff --git a/.gitignore b/.gitignore index b916d83..4b6e8b4 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,24 @@ /buildah-be03809.tar.gz /buildah-02f54e4.tar.gz /buildah-0a7389c.tar.gz +/buildah-87239ae.tar.gz +/buildah-608fa84.tar.gz +/buildah-e94b4f9.tar.gz +/buildah-3ec6a6b.tar.gz +/buildah-5f95bd9.tar.gz +/buildah-873f001.tar.gz +/buildah-4aa16cf.tar.gz +/buildah-e23314b.tar.gz +/buildah-af8fd4a.tar.gz +/buildah-00eb895.tar.gz +/buildah-e5e0547.tar.gz +/buildah-2110f05.tar.gz +/buildah-d2a3249.tar.gz +/buildah-5a3e9fb.tar.gz +/buildah-8c1c2c5.tar.gz +/buildah-2c5da1b.tar.gz +/buildah-413bd1f.tar.gz +/buildah-0bafbfe.tar.gz +/buildah-bdd78ad.tar.gz +/buildah-21b4778.tar.gz +/buildah-9513cb8.tar.gz diff --git a/buildah.spec b/buildah.spec index 3135c10..01793d5 100644 --- a/buildah.spec +++ b/buildah.spec @@ -8,25 +8,33 @@ %global debug_package %{nil} %endif +%if ! 0%{?gobuild:1} +%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; +%endif + %global provider github %global provider_tld com -%global project projectatomic +%global project containers %global repo buildah -# https://github.com/projectatomic/buildah -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit0 0a7389cbbf316ae93f32e133aada0e8be47ca4e0 +# https://github.com/containers/buildah +%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +%global git0 https://%{import_path} +%global commit0 9513cb8c7bec0f7789c696aee4d252ebf85194cc %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%global built_tag v1.11.6 + Name: %{repo} -Version: 1.4 -Release: 1.dev.git%{shortcommit0}%{?dist} +Version: 1.11.6 +Release: 2%{?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 - +URL: https://%{name}.io +Source: %{git0}/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 @@ -42,7 +50,14 @@ BuildRequires: libassuan-devel BuildRequires: make Requires: runc >= 1.0.0-17 Requires: containers-common +%if 0%{?fedora} Recommends: container-selinux +Recommends: slirp4netns >= 0.3-0 +Recommends: fuse-overlayfs +%else +Requires: container-selinux +Requires: slirp4netns >= 0.3-0 +%endif %description The %{name} package provides a command line tool which can be used to @@ -55,6 +70,8 @@ or %prep %autosetup -Sgit -n %{name}-%{commit0} +sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile +sed -i '/docs install/d' Makefile %build mkdir _build @@ -65,14 +82,16 @@ popd mv vendor src -export GOPATH=$(pwd)/_build:$(pwd):%{gopath} -export BUILDTAGS='seccomp' +export GOPATH=$(pwd)/_build:$(pwd) +export BUILDTAGS='seccomp selinux' +export GO111MODULE=off %gobuild -o %{name} %{import_path}/cmd/%{name} -%{__make} docs +GOMD2MAN=go-md2man %{__make} -C docs %install export GOPATH=$(pwd)/_build:$(pwd):%{gopath} make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions +make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install #define license tag if not already defined %{!?_licensedir:%global license %doc} @@ -87,6 +106,92 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions %{_datadir}/bash-completion/completions/%{name} %changelog +* Fri Dec 06 2019 RH Container Bot - 1.11.6-2 +- bump to v1.11.6 +- autobuilt 9513cb8 + +* Mon Oct 28 2019 RH Container Bot - 1.11.4-2 +- bump to v1.11.4 +- autobuilt 21b4778 + +* Fri Oct 04 2019 RH Container Bot - 1.11.3-2 +- bump to v1.11.3 +- autobuilt bdd78ad + +* Tue Sep 17 2019 Lokesh Mandvekar (Bot) - 1.11.2-2.git0bafbfe +- bump to v1.11.2 +- autobuilt 0bafbfe + +* Thu Sep 12 2019 Lokesh Mandvekar (Bot) - 1.11.1-2.git413bd1f +- bump to v1.11.1 +- autobuilt 413bd1f + +* Thu Sep 05 2019 Lokesh Mandvekar (Bot) - 1.11.0-2.git2c5da1b +- bump to v1.11.0 +- autobuilt 2c5da1b + +* Thu Aug 08 2019 Lokesh Mandvekar (Bot) - 1.10.1-2.git8c1c2c5 +- bump to v1.10.1 +- autobuilt 8c1c2c5 + +* Fri Aug 02 2019 Lokesh Mandvekar (Bot) - 1.10.0-2.git5a3e9fb +- bump to v1.10.0 +- autobuilt 5a3e9fb + +* Wed Jul 24 2019 Lokesh Mandvekar - 1.9.2-2 +- use correct commit d2a3249 + +* Fri Jul 19 2019 Lokesh Mandvekar (Bot) - 1.9.2-1 +- bump to 1.9.2 +- autobuilt 2110f05 + +* Mon Jul 15 2019 Lokesh Mandvekar - 1.9.1-3 +- GO111MODULE=off +- update release tag + +* Mon Jul 15 2019 Lokesh Mandvekar (Bot) - 1.9.1-2.gite5e0547 +- bump to 1.9.1 +- autobuilt e5e0547 + +* Sat Jun 15 2019 Dan Walsh - 1.9.0-1.git00eb89 +- Bump to v1.9.0 Release + +* Fri Jun 14 2019 Dan Walsh - 1.8.4-1.gitaf8fd4 +- bump to v1.8.4 Release + +* Fri May 10 2019 Dan Walsh - 1.8.2-1.gite23314 +- bump to v1.8.2 Release + +* Fri Apr 26 2019 Dan Walsh - 1.8.0-1.git4aa16c +- bump to v1.8.0 Release + +* Thu Apr 25 2019 Nalin Dahyabhai - 1.7-18.git873f0014 +- Rebuild with a larger release number to unbreak upgrades from 1.7 prereleases + +* Thu Mar 21 2019 Dan Walsh - 1.7-3.git873f0014 +- Compile with SELinux enabled + +* Wed Mar 06 2019 Dan Walsh - 1.7-2.git873f0014 +- Add recommends for fuse-overlay and slirp4netns + +* Thu Feb 21 2019 Dan Walsh - 1.7-1.git873f0014 +- bump to v1.7 Release + +* 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 +- bump to v1.5 Release + +* 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 - built 0a7389c @@ -446,33 +551,33 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions - autobuilt commit 4743c2e * 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 +- 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 @@ -489,7 +594,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions * Thu Feb 22 2018 Dan Walsh 0.13-1 - Vendor in latest containers/storage -- This fixes a large SELinux bug. +- This fixes a large SELinux bug. - run: do not open /etc/hosts if not needed - Add the following flags to buildah bud and from --add-host @@ -562,7 +667,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions * Thu Nov 16 2017 Dan Walsh 0.7-1 - Ignore errors when trying to read containers buildah.json for loading SELinux reservations -- Use credentials from kpod login for buildah +- Use credentials from kpod login for buildah * Wed Nov 15 2017 Dan Walsh 0.6-1 - Adds support for converting manifest types when using the dir transport @@ -571,38 +676,38 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions - Set option.terminal appropriately in run * Wed Nov 08 2017 Dan Walsh 0.5-2 -- Bump github.com/vbatts/tar-split -- Fixes CVE That could allow a container image to cause a DOS +- Bump github.com/vbatts/tar-split +- Fixes CVE That could allow a container image to cause a DOS * Tue Nov 07 2017 Dan Walsh 0.5-1 -- Add secrets patch to buildah -- Add proper SELinux labeling to buildah run -- Add tls-verify to bud command -- Make filtering by date use the image's date -- images: don't list unnamed images twice -- Fix timeout issue -- Add further tty verbiage to buildah run -- Make inspect try an image on failure if type not specified -- Add support for `buildah run --hostname` -- Tons of bug fixes and code cleanup +- Add secrets patch to buildah +- Add proper SELinux labeling to buildah run +- Add tls-verify to bud command +- Make filtering by date use the image's date +- images: don't list unnamed images twice +- Fix timeout issue +- Add further tty verbiage to buildah run +- Make inspect try an image on failure if type not specified +- Add support for `buildah run --hostname` +- Tons of bug fixes and code cleanup * Fri Sep 22 2017 Dan Walsh 0.4-1.git9cbccf88c -- Add default transport to push if not provided -- Avoid trying to print a nil ImageReference -- Add authentication to commit and push -- Add information on buildah from man page on transports -- Remove --transport flag -- Run: do not complain about missing volume locations -- Add credentials to buildah from -- Remove export command -- Run(): create the right working directory -- Improve "from" behavior with unnamed references -- Avoid parsing image metadata for dates and layers -- Read the image's creation date from public API -- Bump containers/storage and containers/image -- Don't panic if an image's ID can't be parsed -- Turn on --enable-gc when running gometalinter -- rmi: handle truncated image IDs +- Add default transport to push if not provided +- Avoid trying to print a nil ImageReference +- Add authentication to commit and push +- Add information on buildah from man page on transports +- Remove --transport flag +- Run: do not complain about missing volume locations +- Add credentials to buildah from +- Remove export command +- Run(): create the right working directory +- Improve "from" behavior with unnamed references +- Avoid parsing image metadata for dates and layers +- Read the image's creation date from public API +- Bump containers/storage and containers/image +- Don't panic if an image's ID can't be parsed +- Turn on --enable-gc when running gometalinter +- rmi: handle truncated image IDs * Tue Aug 15 2017 Josh Boyer - 0.3-5.gitb9b2a8a - Build for s390x as well @@ -617,23 +722,23 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions - Bump for inclusion of OCI 1.0 Runtime and Image Spec * Tue Jul 18 2017 Dan Walsh 0.2.0-1.gitac2aad6 -- buildah run: Add support for -- ending options parsing -- buildah Add/Copy support for glob syntax -- buildah commit: Add flag to remove containers on commit -- buildah push: Improve man page and help information -- buildah run: add a way to disable PTY allocation -- Buildah docs: clarify --runtime-flag of run command -- Update to match newer storage and image-spec APIs -- Update containers/storage and containers/image versions -- buildah export: add support -- buildah images: update commands -- buildah images: Add JSON output option -- buildah rmi: update commands -- buildah containers: Add JSON output option -- buildah version: add command -- buildah run: Handle run without an explicit command correctly -- Ensure volume points get created, and with perms -- buildah containers: Add a -a/--all option +- buildah run: Add support for -- ending options parsing +- buildah Add/Copy support for glob syntax +- buildah commit: Add flag to remove containers on commit +- buildah push: Improve man page and help information +- buildah run: add a way to disable PTY allocation +- Buildah docs: clarify --runtime-flag of run command +- Update to match newer storage and image-spec APIs +- Update containers/storage and containers/image versions +- buildah export: add support +- buildah images: update commands +- buildah images: Add JSON output option +- buildah rmi: update commands +- buildah containers: Add JSON output option +- buildah version: add command +- buildah run: Handle run without an explicit command correctly +- Ensure volume points get created, and with perms +- buildah containers: Add a -a/--all option * Wed Jun 14 2017 Dan Walsh 0.1.0-2.git597d2ab9 - Release Candidate 1 diff --git a/sources b/sources index afba38a..10c3063 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (buildah-0a7389c.tar.gz) = 12a9679aeefd969023731c54f3c529e8abd704c09b51764ecbb22d9652a9e42884a0c45db71f78fe6921de4576ccd3526a6d8dcd6d893f4fa6abd74440d3a5e4 +SHA512 (buildah-9513cb8.tar.gz) = 1c66c3be631c73cd35b98a28d662bec0a4e5daa12919f20d9d5c8e4683ec3908832803e07aabe78f8e41cdc7719673dbb77020d0ed7a89ef725a079c7bae08cb