diff --git a/container-github-pr434.patch b/container-github-pr434.patch index 05dcb72..b0187dc 100644 --- a/container-github-pr434.patch +++ b/container-github-pr434.patch @@ -1,4 +1,4 @@ -From 12156b34856828e63f0278b38c807842d489aa78 Mon Sep 17 00:00:00 2001 +From e8d4c0e3c49044fc73986c312e6033b47f5a93c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Tue, 25 Feb 2020 14:26:01 +0100 Subject: [PATCH] plugin docker: Fix arch string used for container metadata to @@ -9,7 +9,7 @@ Subject: [PATCH] plugin docker: Fix arch string used for container metadata to 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/imagefactory_plugins/Docker/Docker.py b/imagefactory_plugins/Docker/Docker.py -index 16d928d..d31c527 100644 +index 16d928d..aaa0418 100644 --- a/imagefactory_plugins/Docker/Docker.py +++ b/imagefactory_plugins/Docker/Docker.py @@ -40,6 +40,15 @@ class Docker(object): @@ -33,7 +33,7 @@ index 16d928d..d31c527 100644 if label == 'null': label = dict() - label["architecture"] = tdlobj.arch -+ label["architecture"] = goarchs[tdlobj.arch] ++ label["architecture"] = self.goarchs[tdlobj.arch] rdict = { repository: { tag: docker_image_id } } @@ -51,7 +51,7 @@ index 16d928d..d31c527 100644 tdict['os'] = parameters.get('os', 'linux') tdict['createdtime'] = datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%SZ') - tdict['arch'] = arch -+ tdict['arch'] = goarchs[tdlobj.arch] ++ tdict['arch'] = self.goarchs[tdlobj.arch] tdict['idstring'] = docker_image_id tdict['cmd'] = cmd tdict['env'] = env diff --git a/imagefactory.spec b/imagefactory.spec index 71b698c..46ba9c2 100644 --- a/imagefactory.spec +++ b/imagefactory.spec @@ -1,6 +1,6 @@ Name: imagefactory Version: 1.1.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: System image generation tool License: ASL 2.0 URL: https://github.com/redhat-imaging/imagefactory @@ -93,6 +93,9 @@ rm -f %{buildroot}/%{_initddir}/imagefactoryd %{_bindir}/imagefactoryd %changelog +* Thu Apr 30 2020 Peter Robinson - 1.1.15-2 +- Update container patch to latest rev + * Wed Mar 04 2020 Peter Robinson - 1.1.15-1 - Update to 1.1.15.