diff --git a/.docker-latest.metadata b/.docker-latest.metadata index 8581d4b..e93ca61 100644 --- a/.docker-latest.metadata +++ b/.docker-latest.metadata @@ -1,7 +1,7 @@ a2a9f5deac1f258765a1840240f8d80c2767e99f SOURCES/container-storage-setup-f7a3746.tar.gz 402d105d5ed40a9820d41b3f677df07c566393c9 SOURCES/containerd-296f1f8.tar.gz -3e38eb46a96ca48b28d06945543012f804be810e SOURCES/docker-774336d.tar.gz -fb49d4dd60e576f3a6412c2885256f8954fa5236 SOURCES/libnetwork-14db3c4.tar.gz +c6923103ffa2030844dc0292dd5975443e12eb5c SOURCES/docker-87f2fab.tar.gz +f2f7c536bb870f5edc41a86d70c84439f5f638e3 SOURCES/libnetwork-2bf6330.tar.gz 78795d104677625593c70e1dbe569f235b5af0c5 SOURCES/runc-e9c345b.tar.gz c5c3577b90edc8902f3dd888e55334ba6e9e1ddf SOURCES/tini-5b117de.tar.gz 496f9927f4254508ea1cd94f473b5b9321d41245 SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/.gitignore b/.gitignore index 7a7c98b..dfe5150 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/container-storage-setup-f7a3746.tar.gz SOURCES/containerd-296f1f8.tar.gz -SOURCES/docker-774336d.tar.gz -SOURCES/libnetwork-14db3c4.tar.gz +SOURCES/docker-87f2fab.tar.gz +SOURCES/libnetwork-2bf6330.tar.gz SOURCES/runc-e9c345b.tar.gz SOURCES/tini-5b117de.tar.gz SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service index 1321065..c468d26 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 registries.service Wants=docker-latest-storage-setup.service +Requires=rhel-push-plugin.socket registries.service [Service] Type=notify @@ -17,8 +18,10 @@ Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin ExecStart=/usr/bin/dockerd-latest \ --add-runtime docker-runc=/usr/libexec/docker/docker-runc-latest \ --default-runtime=docker-runc \ + --authorization-plugin=rhel-push-plugin \ --exec-opt native.cgroupdriver=systemd \ --userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \ + --init-path=/usr/libexec/docker/docker-init-latest \ --seccomp-profile=/etc/docker-latest/seccomp.json \ --config-file=/etc/docker-latest/daemon.json \ -g /var/lib/docker-latest \ @@ -35,7 +38,6 @@ LimitNPROC=1048576 LimitCORE=infinity TimeoutStartSec=0 Restart=on-abnormal -MountFlags=slave KillMode=process [Install] diff --git a/SPECS/docker-latest.spec b/SPECS/docker-latest.spec index 2972348..9aec8dd 100644 --- a/SPECS/docker-latest.spec +++ b/SPECS/docker-latest.spec @@ -26,7 +26,7 @@ # docker %global git_docker https://github.com/projectatomic/docker -%global commit_docker 774336db27bb8931c1705e47781b3842d290c968 +%global commit_docker 87f2fab3d32f145760b94b87b93daa83e6841ee7 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7}) # docker_branch used in %%check %global docker_branch docker-1.13.1-rhel @@ -61,12 +61,12 @@ # docker-proxy %global git_libnetwork https://github.com/docker/libnetwork -%global commit_libnetwork 14db3c494c259b8caa159a244a8e9708e3f4b595 +%global commit_libnetwork 2bf63300c52f5ea61989f85c732f00097d746530 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) Name: %{repo}-latest Version: 1.13.1 -Release: 53.git%{shortcommit_docker}%{?dist} +Release: 58.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -171,9 +171,9 @@ Requires: %{repo}-common cp %{SOURCE9} . # rhel debranding for centos -#%if 0%{?centos} -#sed -i 's/ADD_REGISTRY/#ADD_REGISTRY/' %{SOURCE6} -#%endif +%if 0%{?centos} +sed -i 's/ADD_REGISTRY/#ADD_REGISTRY/' %{SOURCE6} +%endif # untar d-s-s tar zxf %{SOURCE1} @@ -204,13 +204,6 @@ tar zxf %{SOURCE14} #cp %%{SOURCE13} . %build -# set up temporary build gopath, and put our directory there -mkdir _build -pushd _build -mkdir -p src/%{provider}.%{provider_tld}/{%{repo},projectatomic} -ln -s $(dirs +1 -l) src/%{import_path} -popd - # compile docker-proxy first - otherwise deps in gopath conflict with the others below and this fails. Remove libnetwork libs then. pushd libnetwork-%{commit_libnetwork} mkdir -p src/github.com/%{repo}/libnetwork @@ -219,6 +212,18 @@ export GOPATH=$(pwd) go build -ldflags="-linkmode=external" -o %{repo}-proxy github.com/%{repo}/libnetwork/cmd/proxy popd +# set up temporary build gopath, and put our directory there +mkdir _build + +%global version_tag %{name}-%{version}-%{release}.%{_arch} +%{__sed} -r -i 's/^([\t ]*PkgVersion:[\t ]*)"",$/\1"%{version_tag}",/' daemon/info.go +%{__sed} -r -i 's/^([\t ]*PkgVersion:[\t ]*)"",$/\1"%{version_tag}",/' cli/command//system/version.go + +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/{%{repo},projectatomic} +ln -s $(dirs +1 -l) src/%{import_path} +popd + export DOCKER_GITCOMMIT="%{shortcommit_docker}/%{version}" export DOCKER_BUILDTAGS='selinux seccomp' export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath} @@ -248,7 +253,7 @@ popd # build %%{repo}-runc pushd runc-%{commit_runc} -make BUILDTAGS='seccomp selinux' +make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} popd # build %%{name}-containerd @@ -263,6 +268,7 @@ popd # build docker-init pushd tini-%{commit_tini} cmake -DMINIMAL=ON . +sed -i 's/#define TINI_GIT ""/#define TINI_GIT " - git.%{commit_tini}"/g' tiniConfig.h make tini-static popd @@ -338,18 +344,17 @@ 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} -#mkdir -p %{buildroot}/etc/%{name}/certs.d/registry.access.redhat.com -#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 -#ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/registry.access.redhat.com/redhat-ca.crt -mkdir -p %{buildroot}%{_sysconfdir}/%{name}/certs.d/ +mkdir -p %{buildroot}%{_sysconfdir}/%{name}/certs.d/redhat.{com,io} +mkdir -p %{buildroot}/etc/%{name}/certs.d/registry.access.redhat.com +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 +ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}%{_sysconfdir}/%{name}/certs.d/registry.access.redhat.com/redhat-ca.crt # install systemd/init scripts install -d %{buildroot}%{_unitdir} @@ -465,14 +470,14 @@ exit 0 %{_unitdir}/%{name}-cleanup.service %{_unitdir}/%{name}-cleanup.timer %{_datadir}/bash-completion/completions/%{name} -#%dir %{_datadir}/rhel -#%{_datadir}/rhel/* +%dir %{_datadir}/rhel +%{_datadir}/rhel/* %dir %{_sharedstatedir}/%{name} %{_udevrulesdir}/80-%{name}.rules %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/certs.d -#%dir %{_sysconfdir}/%{name}/certs.d/redhat.* -#%{_sysconfdir}/%{name}/certs.d/* +%dir %{_sysconfdir}/%{name}/certs.d/redhat.* +%{_sysconfdir}/%{name}/certs.d/* %{_datadir}/vim/vimfiles/doc/%{repo}file-latest.txt %{_datadir}/vim/vimfiles/ftdetect/%{repo}file-latest.vim %{_datadir}/vim/vimfiles/syntax/%{repo}file-latest.vim @@ -517,23 +522,36 @@ exit 0 %endif # with_migrator %changelog -* Wed Mar 7 2018 Johnny Hughes - 1.13.1-53.git774336d -- Manual CentOS Debranding +* Mon Mar 19 2018 Lokesh Mandvekar - 1.13.1-58.git87f2fab +- built docker @projectatomic/docker-1.13.1-rhel commit 87f2fab +- built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8 +- built docker-init commit 5b117de +- built libnetwork commit 2bf6330 + +* Sat Mar 10 2018 Lokesh Mandvekar - 2:1.13.1-56.git774336d +- Re: #1485832 (for docker) -* Tue Feb 20 2018 Lokesh Mandvekar - 1.13.1-53.git774336d +* Tue Feb 20 2018 Lokesh Mandvekar - 1.13.1-55.rhel75.git774336d - built docker @projectatomic/docker-1.13.1-rhel commit 774336d - built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b - built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8 - built docker-init commit 5b117de - built libnetwork commit 14db3c4 -* Mon Feb 12 2018 Lokesh Mandvekar - 1.13.1-52.gitce62987 +* Mon Feb 12 2018 Lokesh Mandvekar - 1.13.1-54.rhel75.gitce62987 - built docker @projectatomic/docker-1.13.1-rhel commit ce62987 - built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b - built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8 - built docker-init commit 0effd37 - built libnetwork commit 1ba8194 +* Tue Feb 06 2018 Lokesh Mandvekar - 1.13.1-50.gitec9911e +- keep release tag in sync with docker + +* Tue Feb 06 2018 Lokesh Mandvekar - 1.13.1-49.gitec9911e +- Resolves: #1542672 - no MountFlags=slave in unitfile + * Mon Feb 05 2018 Lokesh Mandvekar - 1.13.1-48.gitec9911e - keep in sync with docker