diff --git a/.docker-latest.metadata b/.docker-latest.metadata index 814a21b..96469d5 100644 --- a/.docker-latest.metadata +++ b/.docker-latest.metadata @@ -1,3 +1,3 @@ -bf9ba387ce9370bef4e9459f64ecd4160c32d17e SOURCES/docker-a46c31a.tar.gz -438281979dc1753204e4f0d3db374447d05d2252 SOURCES/docker-storage-setup-194eca2.tar.gz +3bb36af0c03466afa5df665edf9d529f6f69a227 SOURCES/docker-f9d4a2c.tar.gz +592dcfc581b1edc99f8c76234ccdab674397f022 SOURCES/docker-storage-setup-338cf62.tar.gz ea4b3d96c46fccb6781d66a6c53c087b179c80fe SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/.gitignore b/.gitignore index 9a63358..566338b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/docker-a46c31a.tar.gz -SOURCES/docker-storage-setup-194eca2.tar.gz +SOURCES/docker-f9d4a2c.tar.gz +SOURCES/docker-storage-setup-338cf62.tar.gz SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service index 06fecd3..9a4b741 100644 --- a/SOURCES/docker-latest.service +++ b/SOURCES/docker-latest.service @@ -1,8 +1,9 @@ [Unit] Description=Docker Application Container Engine Documentation=http://docs.docker.com -After=network.target +After=network.target rhel-push-plugin.socket Wants=docker-latest-storage-setup.service +Requires=rhel-push-plugin.socket [Service] Type=notify @@ -11,7 +12,8 @@ EnvironmentFile=-/etc/sysconfig/docker-latest EnvironmentFile=-/etc/sysconfig/docker-latest-storage EnvironmentFile=-/etc/sysconfig/docker-latest-network Environment=GOTRACEBACK=crash -ExecStart=/bin/sh -c '/usr/bin/docker-latest daemon \ +ExecStart=/usr/bin/docker-latest daemon \ + --authorization-plugin=rhel-push-plugin \ --exec-opt native.cgroupdriver=systemd \ -g /var/lib/docker-latest \ $OPTIONS \ @@ -19,16 +21,13 @@ ExecStart=/bin/sh -c '/usr/bin/docker-latest daemon \ $DOCKER_NETWORK_OPTIONS \ $ADD_REGISTRY \ $BLOCK_REGISTRY \ - $INSECURE_REGISTRY \ - 2>&1 | /usr/bin/forward-journald -tag docker-latest' + $INSECURE_REGISTRY LimitNOFILE=1048576 LimitNPROC=1048576 LimitCORE=infinity TimeoutStartSec=0 MountFlags=slave Restart=on-abnormal -StandardOutput=null -StandardError=null [Install] WantedBy=multi-user.target diff --git a/SOURCES/docker-latest.sysconfig b/SOURCES/docker-latest.sysconfig index eb3cf96..480d931 100644 --- a/SOURCES/docker-latest.sysconfig +++ b/SOURCES/docker-latest.sysconfig @@ -8,7 +8,7 @@ DOCKER_CERT_PATH=/etc/docker # pull use the ADD_REGISTRY option to list a set of registries, each prepended # with --add-registry flag. The first registry added will be the first registry # searched. -#ADD_REGISTRY='--add-registry registry.access.redhat.com' +ADD_REGISTRY='--add-registry registry.access.redhat.com' # If you want to block registries from being used, uncomment the BLOCK_REGISTRY # option and give it a set of registries, each prepended with --block-registry diff --git a/SPECS/docker-latest.spec b/SPECS/docker-latest.spec index 79ade20..9eaada2 100644 --- a/SPECS/docker-latest.spec +++ b/SPECS/docker-latest.spec @@ -26,14 +26,14 @@ # docker %global git0 https://github.com/projectatomic/%{repo} -%global commit0 a46c31af70ca8d15521e312ad9ef7085cfe2fd3f +%global commit0 f9d4a2c183cb4ba202babc9f8649ea043d8c84d0 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # docker_branch used in %%check %global docker_branch rhel7-1.10.3 # d-s-s %global git1 https://github.com/projectatomic/%{repo}-storage-setup/ -%global commit1 194eca25fd0d180b62f3ecf1b7b408992fd6a083 +%global commit1 338cf6237b9613a4c674f8563473e0dc4d61c5fe %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global dss_libdir %{_exec_prefix}/lib/%{name}-storage-setup @@ -51,7 +51,7 @@ Name: %{repo}-latest Version: 1.10.3 -Release: 44%{?dist} +Release: 46%{?dist}.10 Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -68,6 +68,7 @@ Source9: README.%{name}-logrotate Source10: %{name}-network.sysconfig BuildRequires: git BuildRequires: glibc-static +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.6.2 BuildRequires: go-md2man BuildRequires: libseccomp-devel BuildRequires: device-mapper-devel @@ -75,7 +76,6 @@ BuildRequires: pkgconfig(audit) BuildRequires: btrfs-progs-devel BuildRequires: sqlite-devel BuildRequires: pkgconfig(systemd) -BuildRequires: golang >= 1.4.2 Requires: device-mapper-libs >= 7:1.02.97 # RE: rhbz#1195804 - ensure min NVR for selinux-policy @@ -86,11 +86,10 @@ Requires: selinux-policy >= %{selinux_policyver} %global docker_rel %{release} Requires: %{repo}-selinux >= %{docker_ver}-%{docker_rel} -Requires: %{repo}-forward-journald >= %{docker_ver}-%{docker_rel} Requires: %{repo}-common >= %{docker_ver}-%{docker_rel} -#Requires: %{repo}-rhel-push-plugin >= %{docker_ver}-%{docker_rel} -Requires: oci-register-machine >= %{docker_ver}-%{docker_rel} -Requires: oci-systemd-hook >= %{docker_ver}-%{docker_rel} +Requires: %{repo}-rhel-push-plugin >= %{docker_ver}-%{docker_rel} +Requires: oci-register-machine >= 1:0-1.7 +Requires: oci-systemd-hook >= 1:0.1.4-4 # Resolves: rhbz#1045220 Requires: xz @@ -253,15 +252,15 @@ install -p contrib/udev/80-%{repo}.rules %{buildroot}%{_udevrulesdir}/80-%{name} install -d %{buildroot}%{_sharedstatedir}/%{name} # install secret patch directory -#install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets +install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets # rhbz#1110876 - update symlinks for subscription management -#ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement -#ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm -#ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo +ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement +ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm +ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo -#mkdir -p %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.{com,io} -#ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt -#ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.io/redhat-ca.crt +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.{com,io} +ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt +ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.io/redhat-ca.crt # install systemd/init scripts install -d %{buildroot}%{_unitdir} @@ -334,7 +333,7 @@ install -p -m 700 %{SOURCE3} %{buildroot}%{_bindir}/%{name}-v1.10-migrator-helpe } %pre -getent passwd %{repo}root-latest > /dev/null || %{_sbindir}/useradd -r -d %{_sharedstatedir}/%{name} -s /sbin/nologin -c "Docker User" %%{repo}root-latest +getent passwd %{repo}root-latest > /dev/null || %{_sbindir}/useradd -r -d %{_sharedstatedir}/%{name} -s /sbin/nologin -c "Docker User" %{repo}root-latest exit 0 %post @@ -361,8 +360,8 @@ exit 0 %{_unitdir}/%{name}.service %{_unitdir}/%{name}-storage-setup.service %{_datadir}/bash-completion/completions/%{name} -#%dir %{_datadir}/rhel -#%{_datadir}/rhel/* +%dir %{_datadir}/rhel +%{_datadir}/rhel/* %dir %{_sharedstatedir}/%{name} %{_udevrulesdir}/80-%{name}.rules %{_sysconfdir}/%{name} @@ -399,8 +398,42 @@ exit 0 %changelog -* Thu Jun 23 2016 Johnny Hughes - 1.10.3-44 -- Manual CentOS Debranding +* Tue Jul 26 2016 Lokesh Mandvekar - 1.10.3-46.10 +- Resolves: #1361674 - update unitfile to remove the need for +forward-journald + +* Tue Jul 26 2016 Lokesh Mandvekar - 1.10.3-46.9 +- Re: #1359496 +- use rhel-push-plugin commit 4eaaf33 + +* Fri Jul 22 2016 Lokesh Mandvekar - 1.10.3-46.8 +- RE: #1359199, #1359200 +- built docker projectatomic/rhel7-1.10.3 commit f9d4a2c + +* Thu Jul 14 2016 Lokesh Mandvekar - 1.10.3-46.7 +- Resolves: #1352097 - start unitfile after rhel-push-plugin +- built rhel-ppush-plugin lsm5/multi-docker commit 5b7c47b + +* Tue Jul 12 2016 Lokesh Mandvekar - 1.10.3-46.6 +- update oci-register-machine dep requirement + +* Tue Jul 12 2016 Lokesh Mandvekar - 1.10.3-46.5 +- update oci-register-machine dep requirement + +* Tue Jul 12 2016 Lokesh Mandvekar - 1.10.3-46.4 +- built docker projectatomic/rhel7-1.10.3 commit acde006 +- built d-s-s commit 338cf62 +- oci-* have new VR requirements because they are independent +- keep release tags consistent with docker + +* Mon Jul 11 2016 Lokesh Mandvekar - 1.10.3-46.2 +- Resolves: #1350464 - use correct username for dockerroot-latest + +* Sat Jun 25 2016 Lokesh Mandvekar - 1.10.3-46.1 +- add a minor release tag to differentiate between 7.2 and 7.3 + +* Sat Jun 25 2016 Lokesh Mandvekar - 1.10.3-45 +- built with golang >= 1.6.2 * Fri Jun 17 2016 Lokesh Mandvekar - 1.10.3-44 - add MountFlags=slave to unitfile (RE: #1311544)