add upstream patch to compress docker images

epel9
Dennis Gilmore 11 years ago
parent 4736a75e98
commit ebb5f90126

@ -0,0 +1,24 @@
From 073bdb69e73e8943f3fb031f56b3d3ca66412edc Mon Sep 17 00:00:00 2001
From: Jay Greguske <jgregusk@redhat.com>
Date: Tue, 15 Apr 2014 14:45:40 -0400
Subject: compress docker tarball properly
diff --git a/builder/kojid b/builder/kojid
index 1691a54..cee7637 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -2824,7 +2824,8 @@ class BaseImageTask(OzImageTask):
# target-image type images
if 'docker' in self.formats:
- targ = do_target_image(base.base_image.identifier, 'docker')
+ targ = do_target_image(base.base_image.identifier, 'docker',
+ ova_opts={'compress': 'gzip'})
images['docker'] = {'image': targ.target_image.data}
ova_opts = {}
--
cgit v0.10.2

@ -2,7 +2,7 @@
Name: koji
Version: 1.9.0
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2 and GPLv2+
# koji.ssl libs (from plague) are GPLv2+
Summary: Build system tools
@ -11,6 +11,7 @@ URL: http://fedorahosted.org/koji
Patch0: fedora-config.patch
Patch1: 0001-move-workdir-from-tmp-koji-to-var-tmp-koji.patch
Patch2: 0002-image-support-xz-compressed-raw-files.patch
Patch3: compress-docker.patch
Source: https://fedorahosted.org/released/koji/koji-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -93,6 +94,9 @@ Requires: libvirt-python
Requires: libxml2-python
Requires: /usr/bin/virt-clone
Requires: qemu-img
%if 0%{?rhel} <= 7
ExcludeArch: ppc ppc64
%endif
%description vm
koji-vm contains a supplemental build daemon that executes certain tasks in a
@ -126,6 +130,7 @@ koji-web is a web UI to the Koji system.
%patch0 -p1 -b .orig
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
@ -229,6 +234,9 @@ if [ $1 = 0 ]; then
fi
%changelog
* Tue Jul 29 2014 Dennis Gilmore <dennis@ausil.us> - 1.9.0-4
- add upstream patch to compress docker images
* Thu Jun 12 2014 Dennis Gilmore <dennis@ausil.us> - 1.9.0-3
- add patch to move builder workdir to /var/tmp
- add support for making raw.xz images

Loading…
Cancel
Save