Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2016-07-01 09:58:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker" Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2016-06-19 10:49:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2016-07-01 09:58:44.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 24 00:23:57 UTC 2016 - [email protected] + +- readd dropped declaration for patch200 + +------------------------------------------------------------------- @@ -32,0 +38,5 @@ + +------------------------------------------------------------------- +Thu May 19 13:43:44 UTC 2016 - [email protected] + +- Pass over with spec-cleaner, no factual changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.pRyXFe/_old 2016-07-01 09:58:46.000000000 +0200 +++ /var/tmp/diff_new_pack.pRyXFe/_new 2016-07-01 09:58:46.000000000 +0200 @@ -14,16 +14,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# nodebuginfo -%define docker_store /var/lib/docker +%define docker_store %{_localstatedir}/lib/docker %define docker_graph %{docker_store}/graph %define docker_migration_testfile %{docker_store}/.suse-image-migration-v1to2-complete - %define git_version 9e83765 %define go_arches %ix86 x86_64 aarch64 %define version_unconverted 1.11.2 - +%define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: docker Version: 1.11.2 Release: 0 @@ -35,40 +35,24 @@ Source1: docker.service Source3: 80-docker.rules Source4: sysconfig.docker - -%if 0%{?suse_version} > 1320 -Source5: docker.socket -%else -Source5: docker_systemd_lt_214.socket -%endif - Source6: docker-rpmlintrc Source7: README_SUSE.md Source8: docker-audit.rules # TODO: remove once we figure out what is wrong with iptables on ppc64le Source100: sysconfig.docker.ppc64le -# The mount-secrets patch is be a SLE-specific feature. As such, it is disabled by default on openSUSE. -# PATCH-FEATURE-SLE docker-mount-secrets.patch -- pass the SCC machine credentials and the /etc/SUSEConnect file to containers -Patch200: docker-mount-secrets.patch # Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ Patch101: gcc-go-patches.patch Patch102: netlink_gcc_go.patch Patch103: netlink_netns_powerpc.patch +Patch200: docker-mount-secrets.patch # This fixes bnc#964673. This fix is in boltdb upstream, but has yet to be # merged into Docker (in a vendor commit). This patch was cherry-picked from # bolt#555. Patch302: bnc964673-boltdb-metadata-recovery.patch -Requires(post): udev BuildRequires: audit BuildRequires: bash-completion BuildRequires: device-mapper-devel >= 1.2.68 BuildRequires: glibc-devel-static -%ifarch %go_arches -BuildRequires: go >= 1.5 -BuildRequires: go-go-md2man -%else -BuildRequires: gcc5-go >= 5.0 -%endif BuildRequires: libapparmor-devel BuildRequires: libbtrfs-devel >= 3.8 BuildRequires: procps @@ -78,6 +62,8 @@ Requires: apparmor-parser Requires: bridge-utils Requires: ca-certificates-mozilla +# Containerd is required as it is the only currently supported execdriver of Docker. +Requires: containerd # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used Requires: e2fsprogs Requires: git-core >= 1.7 @@ -88,26 +74,27 @@ Requires: procps Requires: tar >= 1.26 Requires: xz >= 4.9 -# Containerd is required as it is the only currently supported execdriver of Docker. -Requires: containerd +Requires(post): %fillup_prereq +Requires(post): udev # Not necessary, but must be installed to have a smooth upgrade. Recommends: docker-image-migrator Conflicts: lxc < 1.0 -PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExcludeArch: %ix86 -ExcludeArch: s390 +ExcludeArch: %ix86 s390 ppc +%if 0%{?suse_version} > 1320 +Source5: docker.socket +%else +Source5: docker_systemd_lt_214.socket +%endif +%ifarch %{go_arches} +BuildRequires: go >= 1.5 +BuildRequires: go-go-md2man +%else +BuildRequires: gcc5-go >= 5.0 +%endif %if 0%{?is_opensuse} ExcludeArch: s390x %endif -ExcludeArch: ppc - -# It's a bad idea to strip Go binaries (apart from making debugging impossible, -# it also is known to cause some interesting runtime bugs). However, rpmbuild -# will strip your binaries if it is creating debuginfo packages (as well as -# doing it by default). So we have to manually disable both of these things. -%undefine _build_create_debug -%define __arch_install_post export NO_BRP_STRIP_DEBUG=true %description Docker complements LXC with a high-level API which operates at the process @@ -139,37 +126,36 @@ Zsh command line completion support for %{name}. %package test +%global __requires_exclude ^libgo.so.*$ Summary: Test package for docker Group: System/Management -Requires: device-mapper-devel >= 1.2.68 -Requires: glibc-devel-static -%ifarch %go_arches -Requires: go >= 1.4 -%else -Requires: gcc5-go >= 5.0 -%endif BuildRequires: fdupes Requires: apparmor-parser Requires: bash-completion +Requires: device-mapper-devel >= 1.2.68 +Requires: glibc-devel-static Requires: libapparmor-devel Requires: libbtrfs-devel >= 3.8 Requires: procps Requires: sqlite3-devel BuildArch: noarch - -%global __requires_exclude ^libgo.so.*$ +%ifarch %{go_arches} +Requires: go >= 1.4 +%else +Requires: gcc5-go >= 5.0 +%endif %description test Test package for docker. It contains the source code and the tests. %prep -%setup -q -n %{name}-%{version} +%setup -q %if 0%{?is_opensuse} # nothing %else %patch200 -p1 %endif -%ifnarch %go_arches +%ifnarch %{go_arches} %patch101 -p1 %patch102 -p1 %patch103 -p1 @@ -179,11 +165,11 @@ cp %{SOURCE7} . %build -%ifnarch %go_arches +%ifnarch %{go_arches} tmphack=/tmp/dirty-hack [ -e $tmphack ] && rm -rf $tmphack mkdir $tmphack -ln -s /usr/bin/go-5 $tmphack/go +ln -s %{_bindir}/go-5 $tmphack/go export PATH=$tmphack:$PATH %endif @@ -195,7 +181,7 @@ ) > docker_build_env . ./docker_build_env -%ifarch %go_arches +%ifarch %{go_arches} ./hack/make.sh dynbinary man/md2man-all.sh %else @@ -209,47 +195,44 @@ %install install -d %{buildroot}%{go_contribdir} install -d %{buildroot}%{_bindir} -%ifarch %go_arches +%ifarch %{go_arches} install -D -m755 bundles/%{version}/dynbinary/%{name}-%{version} %{buildroot}/%{_bindir}/%{name} %else install -D -m755 bundles/%{version}/dyngccgo/%{name}-%{version} %{buildroot}/%{_bindir}/%{name} %endif install -d %{buildroot}/%{_prefix}/lib/docker -install -Dd -m 0755 \ - %{buildroot}%{_sysconfdir}/init.d \ - %{buildroot}%{_sbindir} +install -Dd -m 0755 %{buildroot}%{_sbindir} -install -D -m0644 contrib/completion/bash/docker "%{buildroot}/etc/bash_completion.d/%{name}" -install -D -m0644 contrib/completion/zsh/_docker "%{buildroot}/etc/zsh_completion.d/%{name}" +install -D -m0644 contrib/completion/bash/docker "%{buildroot}%{_sysconfdir}/bash_completion.d/%{name}" +install -D -m0644 contrib/completion/zsh/_docker "%{buildroot}%{_sysconfdir}/zsh_completion.d/%{name}" # copy all for the test package -install -d %{buildroot}/usr/src/docker/ -cp -av . %{buildroot}/usr/src/docker/ +install -d %{buildroot}%{_prefix}/src/docker/ +cp -av . %{buildroot}%{_prefix}/src/docker/ # # systemd service # -install -D -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/%{name}.service -install -D -m 0644 %SOURCE5 %{buildroot}%{_unitdir}/%{name}.socket -ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcdocker +install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service +install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}.socket +ln -sf service %{buildroot}%{_sbindir}/rcdocker # # udev rules that prevents dolphin to show all docker devices and slows down # upstream report https://bugs.kde.org/show_bug.cgi?id=329930 # - -install -D -m 0644 %SOURCE3 %{buildroot}%{_prefix}/lib/udev/rules.d/80-%{name}.rules +install -D -m 0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/80-%{name}.rules # audit rules -install -D -m 0640 %SOURCE8 %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules +install -D -m 0640 %{SOURCE8} %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules # sysconfig file %ifarch ppc64le -install -D -m 644 %SOURCE100 %{buildroot}/var/adm/fillup-templates/sysconfig.docker +install -D -m 644 %{SOURCE100} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.docker %else -install -D -m 644 %SOURCE4 %{buildroot}/var/adm/fillup-templates/sysconfig.docker +install -D -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.docker %endif -%ifarch %go_arches +%ifarch %{go_arches} # install manpages install -d %{buildroot}%{_mandir}/man1 install -p -m 644 man/man1/*.1 %{buildroot}%{_mandir}/man1 @@ -266,9 +249,9 @@ then # In order to make sure we don't print a scary warning when we shouldn't we # need to test these things (in this order): - # 1. Check that /var/lib/docker actually exists (docker daemon has run). + # 1. Check that %{_localstatedir}/lib/docker actually exists (docker daemon has run). # 2. Check that the migrator has *not* finished. - # 3. Check that /var/lib/docker/graph exists (this is a <=1.9.1 thing, but + # 3. Check that %{_localstatedir}/lib/docker/graph exists (this is a <=1.9.1 thing, but # will stick around if it has been migrated -- which is why we need the # MIGRATION_TESTFILE check). # 4. Check that there are images in the graph/ directory. @@ -297,10 +280,10 @@ package. You can run the migration with this command, which will exit after the migration has been completed: -$ /usr/lib/docker-image-migrator/do-image-migration-v1to2.sh +$ %{_libexecdir}/docker-image-migrator/do-image-migration-v1to2.sh Because the migrator requires information about the storage driver used by Docker, -the migration script will source /etc/sysconfig/docker and use \$DOCKER_OPTS as +the migration script will source %{_sysconfdir}/sysconfig/docker and use \$DOCKER_OPTS as arguments to the migrator. If this automated migration fails, it will be re-attempted with every known storage driver. In addition, the script accepts arguments which will simiarly be appended to the set of arguments (after \$DOCKER_OPTS) to the @@ -327,8 +310,7 @@ touch %{docker_migration_testfile} fi -echo "creating group docker..." -groupadd -r docker 2>/dev/null || : +getent group docker >/dev/null || groupadd -r docker %service_add_pre %{name}.service %{name}.socket %post @@ -346,16 +328,16 @@ %doc README.md LICENSE README_SUSE.md %{_bindir}/docker %{_sbindir}/rcdocker -%{_prefix}/lib/docker/ +%{_libexecdir}/docker/ %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket %config %{_sysconfdir}/audit/rules.d/%{name}.rules -%{_prefix}/lib/udev/rules.d/80-%{name}.rules -/var/adm/fillup-templates/sysconfig.docker -%ifarch %go_arches -%{_mandir}/man1/docker-*.1.gz -%{_mandir}/man1/docker.1.gz -%{_mandir}/man5/Dockerfile.5.gz +%{_udevrulesdir}/80-%{name}.rules +%{_localstatedir}/adm/fillup-templates/sysconfig.docker +%ifarch %{go_arches} +%{_mandir}/man1/docker-*.1%{ext_man} +%{_mandir}/man1/docker.1%{ext_man} +%{_mandir}/man5/Dockerfile.5%{ext_man} %endif %files bash-completion @@ -368,13 +350,13 @@ %files test %defattr(-,root,root) -/usr/src/docker/ +%{_prefix}/src/docker/ # exclude binaries -%exclude /usr/src/docker/bundles/ +%exclude %{_prefix}/src/docker/bundles/ # exclude init configurations other than systemd -%exclude /usr/src/docker/contrib/init/openrc -%exclude /usr/src/docker/contrib/init/sysvinit-debian -%exclude /usr/src/docker/contrib/init/sysvinit-redhat -%exclude /usr/src/docker/contrib/init/upstart +%exclude %{_prefix}/src/docker/contrib/init/openrc +%exclude %{_prefix}/src/docker/contrib/init/sysvinit-debian +%exclude %{_prefix}/src/docker/contrib/init/sysvinit-redhat +%exclude %{_prefix}/src/docker/contrib/init/upstart %changelog
