diff --git a/.atomic.metadata b/.atomic.metadata index d07d291..4116c60 100644 --- a/.atomic.metadata +++ b/.atomic.metadata @@ -1 +1 @@ -b8ff92dd0acefe9ea01f67e99082c5bcf53316ca SOURCES/ce09e40922c3f35877d381612280195e445d41c7.tar.gz +c8218cd6d871b599c595473f70ce643f1832a388 SOURCES/b807043930debd3b067ee4234c612872322c8df2.tar.gz diff --git a/.gitignore b/.gitignore index c717a7f..87f856d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ce09e40922c3f35877d381612280195e445d41c7.tar.gz +SOURCES/b807043930debd3b067ee4234c612872322c8df2.tar.gz diff --git a/SOURCES/0001-If-OSTree-is-not-installed-atomic-images-is-blowing-.patch b/SOURCES/0001-If-OSTree-is-not-installed-atomic-images-is-blowing-.patch deleted file mode 100644 index 294ff43..0000000 --- a/SOURCES/0001-If-OSTree-is-not-installed-atomic-images-is-blowing-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7f8d7d56a61e4fb70f2392594adad9b3be095fee Mon Sep 17 00:00:00 2001 -From: Dan Walsh -Date: Wed, 15 Jun 2016 12:57:09 -0400 -Subject: [PATCH 1/2] If OSTree is not installed, atomic images is blowing up - -This fix will check if OSTREE_PRESENT, and return None so -that OSTree will not get called. Will not do any of the system containers -checks. - -Closes: #424 -Approved by: cgwalters ---- - Atomic/atomic.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Atomic/atomic.py b/Atomic/atomic.py -index f583943..1049097 100644 ---- a/Atomic/atomic.py -+++ b/Atomic/atomic.py -@@ -1297,6 +1297,9 @@ class Atomic(object): - "/var/lib/containers/atomic" - - def _get_ostree_repo(self): -+ if not OSTREE_PRESENT: -+ return None -+ - repo_location = os.environ.get("ATOMIC_OSTREE_REPO") or \ - self.get_atomic_config_item(["ostree_repository"]) or \ - "/ostree/repo" --- -1.8.3.1 - diff --git a/SOURCES/0002-Atomic-scan-fix-image-naming-error.patch b/SOURCES/0002-Atomic-scan-fix-image-naming-error.patch deleted file mode 100644 index 150fe94..0000000 --- a/SOURCES/0002-Atomic-scan-fix-image-naming-error.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0261f9b169a425b262c3a92c81225afa342a6087 Mon Sep 17 00:00:00 2001 -From: Alex Jia -Date: Wed, 8 Jun 2016 07:19:31 -0400 -Subject: [PATCH 2/2] Atomic/scan: fix image naming error - -Signed-off-by: Alex Jia - -Closes: #415 -Approved by: rhatdan ---- - Atomic/scan.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Atomic/scan.py b/Atomic/scan.py -index d334621..e8b4233 100644 ---- a/Atomic/scan.py -+++ b/Atomic/scan.py -@@ -95,7 +95,6 @@ class Scan(Atomic): - if len(self.args.rootfs) == 0: - scan_list = self._get_scan_list() - for i in scan_list: -- i['Id'] = i['Id'].replace(":", "-") - self.scan_content[i['Id']] = i.get('input') - - # mount all the rootfs --- -1.8.3.1 - diff --git a/SPECS/atomic.spec b/SPECS/atomic.spec index ba25824..50b4dc6 100644 --- a/SPECS/atomic.spec +++ b/SPECS/atomic.spec @@ -13,25 +13,24 @@ %global pylint python3-pylint %endif -%global commit0 ce09e40922c3f35877d381612280195e445d41c7 +%global commit0 b807043930debd3b067ee4234c612872322c8df2 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: atomic Epoch: 1 -Version: 1.10.5 -Release: 7%{?dist} +Version: 1.12.5 +Release: 2%{?dist} Summary: Tool for managing ProjectAtomic systems and containers License: LGPLv2+ URL: https://github.com/projectatomic/%{name} ExclusiveArch: x86_64 Source0: https://github.com/projectatomic/%{name}/archive/%{commit0}.tar.gz -Patch0: 0001-If-OSTree-is-not-installed-atomic-images-is-blowing-.patch -Patch1: 0002-Atomic-scan-fix-image-naming-error.patch BuildRequires: %{pypkg}-devel BuildRequires: %{pypkg}-requests >= 2.4.3 BuildRequires: %{pypkg}-setuptools BuildRequires: %{pypkg}-tools +BuildRequires: %{pypkg}-ipaddress BuildRequires: %{pypkg}-dbus BuildRequires: %{pypkg}-setuptools BuildRequires: policycoreutils-%{pypkg} @@ -42,6 +41,7 @@ BuildRequires: %{pypkg}-dbus BuildRequires: %{pypkg}-docker-py >= 1.7.2-1 BuildRequires: rpm-%{pypkg} BuildRequires: PyYAML +BuildRequires: %{pypkg}-dateutil Requires: dbus Requires: docker @@ -50,6 +50,7 @@ Requires: setup Requires: rpm-%{pypkg} Requires: %{pypkg}-setuptools Requires: %{pypkg}-requests +Requires: %{pypkg}-ipaddress Requires: %{pypkg}-docker-py >= 1.7.2-1 Requires: %{pypkg}-websocket-client >= 0.11.0 Requires: %{pypkg}-six >= 1.3.0 @@ -74,10 +75,10 @@ sed -i 's/input = raw_input/pass/' Atomic/util.py fi %build -make PYTHON=%{__python} python-build docs dockertar-sha256-helper +make PYTHON=%{__python} python-build docs dockertar-sha256-helper gotar %install -make PYTHON=%{__python} install-only DESTDIR=%{buildroot} +make PYTHON=%{__python} install-only DESTDIR=%{buildroot} %if 0%{?rhel} make install-openscap DESTDIR=%{buildroot} @@ -120,10 +121,53 @@ EOF %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}.conf -%dir %{_sysconfdir}/%{name}.d +%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml %config(noreplace) %{_sysconfdir}/%{name}.d/openscap +%dir %{_sysconfdir}/%{name}.d +%dir %{_sysconfdir}/containers +%dir %{_sysconfdir}/containers/registries.d +%dir %{_sharedstatedir}/%{name}/sigstore %changelog +* Mon Sep 26 2016 Lokesh Mandvekar - 1:1.12.5-2 +- install /var/lib/atomic/sigstore + +* Mon Sep 26 2016 Lokesh Mandvekar - 1:1.12.5-1 +- built commit b807043 + +* Tue Sep 20 2016 Lokesh Mandvekar - 1:1.12.3-2 +- built commit d551996 + +* Tue Sep 20 2016 Lokesh Mandvekar - 1:1.12.3-1 +- bump to v1.12.3 +- built commit bc0141b + +* Tue Sep 20 2016 Lokesh Mandvekar - 1:1.12.2-3 +- Resolves: #1376600 +- built commit 4729fc0 +- include default.yaml file for for OOTB signing experience. + +* Fri Sep 16 2016 Lokesh Mandvekar - 1:1.12.2-2 +- update changelog with bz#'s fixed in previous build + +* Fri Sep 16 2016 Lokesh Mandvekar - 1:1.12.2-1 +- bump to v1.12.2 +- Resolves: #1375891 #1366937 #1353626 #1366255 #1347037 #1343948 +- Resolves: #1342060 #1361949 #1350712 #1368566 #1342047 #1346921 +- Resolves: #1346930 #1327529 #1346929 #1345820 + +* Tue Sep 13 2016 Lokesh Mandvekar - 1:1.12.1-3 +- Resolves: #1374676 - only check setvalues argument when OSTREE_PRESENT + +* Tue Sep 13 2016 Lokesh Mandvekar - 1:1.12.1-2 +- Resolves: #1375578 + +* Tue Sep 13 2016 Lokesh Mandvekar - 1:1.12.1-1 +- rebase to v.1.12.1 + +* Tue Sep 06 2016 Lokesh Mandvekar - 1:1.12.0-1 +- Resolves: #1373977 - rebase to v1.12.0 + * Tue Jul 12 2016 Lokesh Mandvekar - 1:1.10.5-7 - use skopeo >= 1:0.1.13-7