diff --git a/.docker.metadata b/.docker.metadata index 2d74c09..fa10d02 100644 --- a/.docker.metadata +++ b/.docker.metadata @@ -1,4 +1,4 @@ 6c18476dcf8d5a7ad920b48cc3066b894fc66b83 SOURCES/a01dc02d9c369141f8bbbea0f51e8759dd6e5b93.tar.gz 18870c5eeee96c30dca0812c1ad4fd469595cbd6 SOURCES/dab51acd1b1a77f7cb01a1b7e2129ec85c846b71.tar.gz -6d54ce77bcb43000bbd329a4839fe4204d2c8f80 SOURCES/docker-selinux-e2a5226.tar.gz -e3a90d52c646cd099d668efa2075f92314609498 SOURCES/docker-storage-setup-6898d43.tar.gz +86cab80803a15bd81d23ffddc1c7911492357845 SOURCES/docker-selinux-dbfad05.tar.gz +5693493e59b051c31e08cf9c62127ffe3990e61a SOURCES/docker-storage-setup-e9722cc.tar.gz diff --git a/.gitignore b/.gitignore index c4372bf..8a8b21f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/a01dc02d9c369141f8bbbea0f51e8759dd6e5b93.tar.gz SOURCES/dab51acd1b1a77f7cb01a1b7e2129ec85c846b71.tar.gz -SOURCES/docker-selinux-e2a5226.tar.gz -SOURCES/docker-storage-setup-6898d43.tar.gz +SOURCES/docker-selinux-dbfad05.tar.gz +SOURCES/docker-storage-setup-e9722cc.tar.gz diff --git a/SOURCES/docker-storage.sysconfig b/SOURCES/docker-storage.sysconfig index 3dc1654..6977865 100644 --- a/SOURCES/docker-storage.sysconfig +++ b/SOURCES/docker-storage.sysconfig @@ -1,14 +1,10 @@ # This file may be automatically generated by an installation program. +# Please DO NOT edit this file directly. Instead edit +# /etc/sysconfig/docker-storage-setup and/or refer to +# "man docker-storage-setup". # By default, Docker uses a loopback-mounted sparse file in # /var/lib/docker. The loopback makes it slower, and there are some # restrictive defaults, such as 100GB max storage. -# If your installation did not set a custom storage for Docker, you -# may do it below. - -# Example: Use a custom pair of raw logical volumes (one for metadata, -# one for data). -# DOCKER_STORAGE_OPTIONS = --storage-opt dm.metadatadev=/dev/mylogvol/my-docker-metadata --storage-opt dm.datadev=/dev/mylogvol/my-docker-data - DOCKER_STORAGE_OPTIONS= diff --git a/SOURCES/docker.service b/SOURCES/docker.service index 7a19251..afa4db0 100644 --- a/SOURCES/docker.service +++ b/SOURCES/docker.service @@ -21,6 +21,7 @@ LimitNPROC=1048576 LimitCORE=infinity MountFlags=slave TimeoutStartSec=1min +Restart=on-failure [Install] WantedBy=multi-user.target diff --git a/SOURCES/docker.sysconfig b/SOURCES/docker.sysconfig index d3938bf..196c66f 100644 --- a/SOURCES/docker.sysconfig +++ b/SOURCES/docker.sysconfig @@ -9,7 +9,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.spec b/SPECS/docker.spec index a8432c4..f9341bb 100644 --- a/SPECS/docker.spec +++ b/SPECS/docker.spec @@ -16,12 +16,13 @@ %global d_commit a01dc02d9c369141f8bbbea0f51e8759dd6e5b93 %global d_shortcommit %(c=%{d_commit}; echo ${c:0:7}) +%global d_dist %(echo %{?dist} | sed 's/./-/') %global utils_commit dab51acd1b1a77f7cb01a1b7e2129ec85c846b71 # %%{name}-selinux stuff (prefix with ds_ for version/release etc.) # Some bits borrowed from the openstack-selinux package -%global ds_commit e2a52267a0ae0b8a0f93334747dd5f1d0cf0d368 +%global ds_commit dbfad05ac749c9cdf5df57f6a5132f4cc0493098 %global ds_shortcommit %(c=%{ds_commit}; echo ${c:0:7}) %global selinuxtype targeted %global moduletype services @@ -29,7 +30,7 @@ # %%{name}-storage-setup stuff (prefix with dss_ for version/release etc.) %global dss_libdir %{_prefix}/lib/%{name}-storage-setup -%global dss_commit 6898d433f7c7666475656ab89565ec02d08c4c55 +%global dss_commit e9722cc6da4b46d783a9c4cf86ac4b8aaf7ce301 %global dss_shortcommit %(c=%{dss_commit}; echo ${c:0:7}) # Usage: _format var format @@ -49,15 +50,15 @@ Name: %{repo} Version: %{d_version} -Release: 8%{?dist} +Release: 10%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{import_path} # only x86_64 for now: https://%%{provider}.%%{provider_tld}/%%{name}/%%{name}/issues/136 ExclusiveArch: x86_64 # Branch used available at -# https://%%{provider}.%%{provider_tld}/rhatdan/%%{name}/commits/rhel7-1.8 -Source0: https://%{provider}.%{provider_tld}/rhatdan/%{name}/archive/%{d_commit}.tar.gz +# https://%%{provider}.%%{provider_tld}/projectatomic/%%{name}/commits/rhel7-1.8 +Source0: https://%{provider}.%{provider_tld}/projectatomic/%{name}/archive/%{d_commit}.tar.gz Source1: %{name}.service Source3: %{name}.sysconfig Source4: %{name}-storage.sysconfig @@ -73,6 +74,7 @@ Source13: https://%{provider}.%{provider_tld}/projectatomic/%{name}-storage-setu BuildRequires: glibc-static BuildRequires: golang == 1.4.2 BuildRequires: device-mapper-devel +BuildRequires: pkgconfig(audit) BuildRequires: btrfs-progs-devel BuildRequires: sqlite-devel BuildRequires: go-md2man @@ -84,7 +86,7 @@ Requires(postun): systemd # need xz to work with ubuntu images Requires: xz Requires: device-mapper-libs >= 7:1.02.90-1 -#Requires: subscription-manager +Requires: subscription-manager Provides: lxc-%{name} = %{d_version}-%{release} Provides: %{name}-io = %{d_version}-%{release} @@ -96,6 +98,9 @@ Requires(pre): %{name}-selinux >= %{version}-%{release} Requires: lvm2 >= 2.02.112 Requires: xfsprogs +# rhbz#1282898 - obsolete docker-storage-setup +Obsoletes: %{repo}-storage-setup <= 0.0.4-2 + %description Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will @@ -165,7 +170,8 @@ export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath} # build %%{name} binary sed -i '/rm -r autogen/d' hack/make.sh -DEBUG=1 hack/make.sh dynbinary +sed -i 's/$/%{d_dist}/' VERSION +DOCKER_DEBUG=1 hack/make.sh dynbinary cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax cp contrib/syntax/vim/README.md README-vim-syntax.md @@ -175,7 +181,7 @@ make SHARE="%{_datadir}" TARGETS="%{modulenames}" popd pushd $(pwd)/_build/src -# build %{name}tarsum and %{name}-fetch +# build %{repo}tarsum and %{repo}-fetch go build %{provider}.%{provider_tld}/vbatts/%{name}-utils/cmd/%{name}-fetch go build %{provider}.%{provider_tld}/vbatts/%{name}-utils/cmd/%{name}tarsum popd @@ -186,15 +192,20 @@ man/md2man-all.sh %install # install binary install -d %{buildroot}%{_bindir} -install -p -m 755 bundles/%{d_version}/dynbinary/%{name}-%{d_version} %{buildroot}%{_bindir}/%{name} +install -d %{buildroot}%{_libexecdir}/%{name} # install %%{name}tarsum and %%{name}-fetch install -p -m 755 _build/src/%{name}-fetch %{buildroot}%{_bindir} install -p -m 755 _build/src/%{name}tarsum %{buildroot}%{_bindir} -# install %%{name}init -install -d %{buildroot}%{_libexecdir}/%{name} -install -p -m 755 bundles/%{d_version}/dynbinary/%{name}init-%{d_version} %{buildroot}%{_libexecdir}/%{name}/%{name}init +for x in bundles/*%{d_dist}; do + if ! test -d $x/dynbinary; then + continue + fi + install -p -m 755 $x/dynbinary/%{repo}-*%{d_dist} %{buildroot}%{_bindir}/%{repo} + install -p -m 755 $x/dynbinary/%{repo}init-*%{d_dist} %{buildroot}%{_libexecdir}/%{repo}/%{repo}init + break +done # install manpages install -d %{buildroot}%{_mandir}/man1 @@ -266,17 +277,16 @@ rm -rf %{buildroot}%{_sharedstatedir}/%{name}-unit-test/contrib/init/openrc/%{na # remove %%{name}-selinux rpm spec file rm -rf %{name}-selinux-%{ds_commit}/%{name}-selinux.spec -# don't install secrets dir -# install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets +# install secrets dir +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}/etc/%{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}/etc/%{name}/certs.d +mkdir -p %{buildroot}/etc/%{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 %%{name} config directory install -dp %{buildroot}%{_sysconfdir}/%{name}/ @@ -322,7 +332,7 @@ if %{_sbindir}/selinuxenabled ; then %{_sbindir}/load_policy %relabel_files if [ $1 -eq 1 ]; then - restorecon -R %{_sharedstatedir}/%{repo} + restorecon -R %{_sharedstatedir}/%{repo} &> /dev/null || : fi fi @@ -347,11 +357,11 @@ fi %{_mandir}/man1/%{name}* %{_mandir}/man5/* %{_bindir}/%{name} -#%dir %{_datadir}/rhel -#%dir %{_datadir}/rhel/secrets -#%{_datadir}/rhel/secrets/etc-pki-entitlement -#%{_datadir}/rhel/secrets/rhel7.repo -#%{_datadir}/rhel/secrets/rhsm +%dir %{_datadir}/rhel +%dir %{_datadir}/rhel/secrets +%{_datadir}/rhel/secrets/etc-pki-entitlement +%{_datadir}/rhel/secrets/rhel7.repo +%{_datadir}/rhel/secrets/rhsm %{_libexecdir}/%{name} %{_unitdir}/%{name}.service %config(noreplace) %{_sysconfdir}/sysconfig/%{name} @@ -394,6 +404,62 @@ fi %{_datadir}/selinux/* %changelog +* Wed Nov 11 2015 Lokesh Mandvekar - 1.8.2-10 +- Resolves: rhbz#1281805, rhbz#1271229, rhbz#1276346 +- Resolves: rhbz#1275376, rhbz#1282898 + +* Wed Nov 11 2015 Lokesh Mandvekar - 1.8.2-9 +- Resolves: rhbz#1280068 - Build docker with DWARF +- Move back to 1.8.2 +- built docker @rhatdan/rhel7-1.8 commit#a01dc02 +- built docker-selinux commit#dbfad05 +- built d-s-s commit#e9722cc +- built docker-utils commit#dab51ac + +* Mon Nov 02 2015 Lokesh Mandvekar - 1.9.0-8 +- Resolves: rhbz#1225093 (partially) +- built docker @projectatomic/rhel7-1.9 commit#cdd3941 +- built docker-selinux commit#dbfad05 +- built d-s-s commit#e9722cc +- built docker-utils commit#dab51ac + +* Wed Oct 28 2015 Lokesh Mandvekar - 1.9.0-7 +- Resolves: rhbz#1275554 +- built docker @projectatomic/rhel7-1.9 commit#61fd965 +- built docker-selinux commit#dbfad05 +- built d-s-s commit#e9722cc +- built docker-utils commit#dab51ac + +* Wed Oct 28 2015 Lokesh Mandvekar - 1.9.0-6 +- built docker @projectatomic/rhel7-1.9 commit#166d43b +- built docker-selinux commit#dbfad05 +- built d-s-s commit#e9722cc +- built docker-utils commit#dab51ac + +* Mon Oct 26 2015 Lokesh Mandvekar - 1.9.0-5 +- built docker @projectatomic/rhel7-1.9 commit#6897d78 +- built docker-selinux commit#dbfad05 +- built d-s-s commit#e9722cc +- built docker-utils commit#dab51ac + +* Fri Oct 23 2015 Lokesh Mandvekar - 1.9.0-4 +- built docker @projectatomic/rhel7-1.9 commit#0bb2bf4 +- built docker-selinux commit#dbfad05 +- built d-s-s commit#e9722cc +- built docker-utils commit#dab51ac + +* Thu Oct 22 2015 Lokesh Mandvekar - 1.9.0-3 +- built docker @projectatomic/rhel7-1.9 commit#1ea7f30 +- built docker-selinux commit#dbfad05 +- built d-s-s commit#01df512 +- built docker-utils commit#dab51ac + +* Thu Oct 22 2015 Lokesh Mandvekar - 1.9.0-2 +- built docker @projectatomic/rhel7-1.9 commit#1ea7f30 +- built docker-selinux commit#fe61432 +- built d-s-s commit#01df512 +- built docker-utils commit#dab51ac + * Wed Oct 14 2015 Lokesh Mandvekar - 1.8.2-8 - built docker @rhatdan/rhel7-1.8 commit#a01dc02 - built docker-selinux master commit#e2a5226