rpms/buildah
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Try to deal with buildah copy-helper nightmare

Browse Source 
Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2021-07-19 08:52:33 -06:00
parent 96c58a5dc5
commit a2a76a81cb
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildah.spec
View File

@ -33,7 +33,7 @@
Name: %{repo} Name: %{repo}
Version: 1.22.0 Version: 1.22.0
Release: 0.11.dev.git%{shortcommit0}%{?dist} Release: 0.13.dev.git%{shortcommit0}%{?dist}
Summary: A command line tool used for creating OCI Images Summary: A command line tool used for creating OCI Images
License: ASL 2.0 License: ASL 2.0
URL: https://%{name}.io URL: https://%{name}.io
@ -128,6 +128,7 @@ export BUILDTAGS+=' exclude_graphdriver_btrfs'
%endif %endif
%gobuild -o bin/%{name} %{import_path}/cmd/%{name} %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
%gobuild -o bin/imgtype %{import_path}/tests/imgtype %gobuild -o bin/imgtype %{import_path}/tests/imgtype
%gobuild -o bin/copy %{import_path}/tests/copy
GOMD2MAN=go-md2man %{__make} -C docs GOMD2MAN=go-md2man %{__make} -C docs
%install %install
@ -138,6 +139,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
install -d -p %{buildroot}/%{_datadir}/%{name}/test/system install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy
#define license tag if not already defined #define license tag if not already defined
%{!?_licensedir:%global license %doc} %{!?_licensedir:%global license %doc}
@ -154,9 +156,13 @@ cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
%files tests %files tests
%license LICENSE %license LICENSE
%{_bindir}/%{name}-imgtype %{_bindir}/%{name}-imgtype
%{_bindir}/%{name}-copy
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%changelog %changelog
* Mon Jul 19 2021 Eduardo Santiago <santiago@redhat.com> - 1.22.0-0.13.dev.gitec35bc4
- Try to deal with new buildah-copy-helper nightmare
* Fri Jul 16 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.22.0-0.12.dev.gitec35bc4 * Fri Jul 16 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.22.0-0.12.dev.gitec35bc4
- Resolves: #1969264, #1982880 - Security fix for CVE-2021-3602 - Resolves: #1969264, #1982880 - Security fix for CVE-2021-3602

1
tests/test_buildah.sh
View File

@ -13,6 +13,7 @@ env | grep -v LS_COLORS= | sort | sed -e 's/^/ /'
export BUILDAH_BINARY=/usr/bin/buildah export BUILDAH_BINARY=/usr/bin/buildah
export IMGTYPE_BINARY=/usr/bin/buildah-imgtype export IMGTYPE_BINARY=/usr/bin/buildah-imgtype
export COPY_BINARY=/usr/bin/buildah-copy
############################################################################### ###############################################################################
# BEGIN setup/teardown # BEGIN setup/teardown