forked from pool/docker
- Updated to 1.7.0 (2015-06-16) - bnc#935570
* Runtime
- Experimental feature: support for out-of-process volume plugins
- The userland proxy can be disabled in favor of hairpin NAT using the daemon’s `--userland-proxy=false` flag
- The `exec` command supports the `-u|--user` flag to specify the new process owner
- Default gateway for containers can be specified daemon-wide using the `--default-gateway` and `--default-gateway-v6` flags
- The CPU CFS (Completely Fair Scheduler) quota can be set in `docker run` using `--cpu-quota`
- Container block IO can be controlled in `docker run` using`--blkio-weight`
- ZFS support
- The `docker logs` command supports a `--since` argument
- UTS namespace can be shared with the host with `docker run --uts=host`
* Quality
- Networking stack was entirely rewritten as part of the libnetwork effort
- Engine internals refactoring
- Volumes code was entirely rewritten to support the plugins effort
- Sending SIGUSR1 to a daemon will dump all goroutines stacks without exiting
* Build
- Support ${variable:-value} and ${variable:+value} syntax for environment variables
- Support resource management flags `--cgroup-parent`, `--cpu-period`, `--cpu-quota`, `--cpuset-cpus`, `--cpuset-mems`
- git context changes with branches and directories
- The .dockerignore file support exclusion rules
* Distribution
- Client support for v2 mirroring support for the official registry
* Bugfixes
- Firewalld is now supported and will automatically be used when available
- mounting --device recursively
- Patch 0002-Stripped-dockerinit-binary.patch renamed to fix-docker-init.patch
and fixed to build with latest version of docker
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=12
This commit is contained in:
Flavio Castelli
Git OBS Bridge
parent
84f28f19ef
commit
a2023564fb
@ -1,29 +0,0 @@
|
||||
From 86a768c5a830220024a56495f18e88bfc21f3aac Mon Sep 17 00:00:00 2001
|
||||
From: Flavio Castelli <fcastelli@suse.com>
|
||||
Date: Wed, 26 Mar 2014 17:50:19 +0100
|
||||
Subject: [PATCH 2/2] Stripped dockerinit binary
|
||||
|
||||
The sha1sum of `dockerinit` is hardcoded into `docker` binary and is
|
||||
checked at runtime. OBS strips the debugging symbols from all the
|
||||
binaries (and hence also from `dockerinit`). That causes the sha1sum of
|
||||
the installed file to be different from the value computed inside of the
|
||||
buildroot.
|
||||
|
||||
This commit strips the debugging symbols from `dockerinit` _before_ the
|
||||
`docker` binary is built. Avoiding all the runtime errors.
|
||||
---
|
||||
hack/make/dynbinary | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
Index: docker/hack/make/.dockerinit
|
||||
===================================================================
|
||||
--- docker.orig/hack/make/.dockerinit
|
||||
+++ docker/hack/make/.dockerinit
|
||||
@@ -29,5 +29,7 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
+/usr/bin/strip -s $DEST/dockerinit-$VERSION
|
||||
+
|
||||
# sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another
|
||||
export DOCKER_INITSHA1="$($sha1sum $DEST/dockerinit-$VERSION | cut -d' ' -f1)"
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d819c93af2c7dd7ad75d24df5ea525efe2abac8ff23c0a9667796dedd21c8f9f
|
||||
size 5480404
|
||||
3
docker-1.7.0.tar.bz2
Normal file
3
docker-1.7.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:760807f5c0a28f5262006704d2c682733bf7cddc4bfb1464f7b7eb88c84cb9a6
|
||||
size 6524566
|
||||
@ -1,3 +1,35 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 22 08:48:11 UTC 2015 - fcastelli@suse.com
|
||||
|
||||
- Updated to 1.7.0 (2015-06-16) - bnc#935570
|
||||
* Runtime
|
||||
- Experimental feature: support for out-of-process volume plugins
|
||||
- The userland proxy can be disabled in favor of hairpin NAT using the daemon’s `--userland-proxy=false` flag
|
||||
- The `exec` command supports the `-u|--user` flag to specify the new process owner
|
||||
- Default gateway for containers can be specified daemon-wide using the `--default-gateway` and `--default-gateway-v6` flags
|
||||
- The CPU CFS (Completely Fair Scheduler) quota can be set in `docker run` using `--cpu-quota`
|
||||
- Container block IO can be controlled in `docker run` using`--blkio-weight`
|
||||
- ZFS support
|
||||
- The `docker logs` command supports a `--since` argument
|
||||
- UTS namespace can be shared with the host with `docker run --uts=host`
|
||||
* Quality
|
||||
- Networking stack was entirely rewritten as part of the libnetwork effort
|
||||
- Engine internals refactoring
|
||||
- Volumes code was entirely rewritten to support the plugins effort
|
||||
- Sending SIGUSR1 to a daemon will dump all goroutines stacks without exiting
|
||||
* Build
|
||||
- Support ${variable:-value} and ${variable:+value} syntax for environment variables
|
||||
- Support resource management flags `--cgroup-parent`, `--cpu-period`, `--cpu-quota`, `--cpuset-cpus`, `--cpuset-mems`
|
||||
- git context changes with branches and directories
|
||||
- The .dockerignore file support exclusion rules
|
||||
* Distribution
|
||||
- Client support for v2 mirroring support for the official registry
|
||||
* Bugfixes
|
||||
- Firewalld is now supported and will automatically be used when available
|
||||
- mounting --device recursively
|
||||
- Patch 0002-Stripped-dockerinit-binary.patch renamed to fix-docker-init.patch
|
||||
and fixed to build with latest version of docker
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 9 16:35:46 UTC 2015 - jmassaguerpla@suse.com
|
||||
|
||||
|
||||
22
docker.spec
22
docker.spec
@ -16,9 +16,9 @@
|
||||
#
|
||||
|
||||
|
||||
%define git_version 7c8fca2
|
||||
%define git_version 0baf609
|
||||
Name: docker
|
||||
Version: 1.6.2
|
||||
Version: 1.7.0
|
||||
Release: 0
|
||||
Summary: The Linux container runtime
|
||||
License: Apache-2.0
|
||||
@ -39,7 +39,7 @@ Source6: docker-rpmlintrc
|
||||
Source7: README_SUSE.md
|
||||
# TODO: remove once we figure out what is wrong with iptables on ppc64le
|
||||
Source100: sysconfig.docker.ppc64le
|
||||
Patch0: 0002-Stripped-dockerinit-binary.patch
|
||||
Patch0: fix-docker-init.patch
|
||||
# PATCH-FIX-OPENSUSE libcontainer-apparmor-fixes.patch -- mount rules aren't supported in our apparmor
|
||||
Patch1: libcontainer-apparmor-fixes.patch
|
||||
# Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
|
||||
@ -54,7 +54,7 @@ BuildRequires: glibc-devel-static
|
||||
%ifarch ppc ppc64 s390x ppc64p7 ppc64le
|
||||
BuildRequires: gcc5-go >= 5.0
|
||||
%else
|
||||
BuildRequires: go >= 1.3
|
||||
BuildRequires: go >= 1.4
|
||||
%endif
|
||||
BuildRequires: go-go-md2man
|
||||
BuildRequires: libapparmor-devel
|
||||
@ -139,6 +139,7 @@ Test package for docker. It contains the source code and the tests.
|
||||
%patch101 -p1
|
||||
%endif
|
||||
cp %{SOURCE7} .
|
||||
find . -name ".gitignore" | xargs rm
|
||||
|
||||
%build
|
||||
%ifarch ppc ppc64 s390x ppc64p7 ppc64le
|
||||
@ -155,15 +156,10 @@ EOF
|
||||
) > docker_build_env
|
||||
. ./docker_build_env
|
||||
./hack/make.sh dynbinary
|
||||
docs/man/md2man-all.sh
|
||||
# remove git files
|
||||
find . -name ".gitignore" | xargs rm
|
||||
man/md2man-all.sh
|
||||
# remove other than systemd
|
||||
# otherwise the resulting package will have extra requires
|
||||
rm -rf contrib/init/openrc
|
||||
rm -rf contrib/init/sysvinit-debian
|
||||
rm -rf contrib/init/sysvinit-redhat
|
||||
rm -rf contrib/init/upstart
|
||||
rm -rf hack/make/.build-deb
|
||||
|
||||
%install
|
||||
install -d %{buildroot}%{go_contribdir}
|
||||
@ -204,9 +200,9 @@ install -D -m 644 %SOURCE4 %{buildroot}/var/adm/fillup-templates/sysconfig.docke
|
||||
|
||||
# install manpages
|
||||
install -d %{buildroot}%{_mandir}/man1
|
||||
install -p -m 644 docs/man/man1/*.1 %{buildroot}%{_mandir}/man1
|
||||
install -p -m 644 man/man1/*.1 %{buildroot}%{_mandir}/man1
|
||||
install -d %{buildroot}%{_mandir}/man5
|
||||
install -p -m 644 docs/man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5
|
||||
install -p -m 644 man/man5/Dockerfile.5 %{buildroot}%{_mandir}/man5
|
||||
|
||||
%pre
|
||||
echo "creating group docker..."
|
||||
|
||||
12
fix-docker-init.patch
Normal file
12
fix-docker-init.patch
Normal file
@ -0,0 +1,12 @@
|
||||
Index: docker/hack/make/.dockerinit
|
||||
===================================================================
|
||||
--- docker.orig/hack/make/.dockerinit
|
||||
+++ docker/hack/make/.dockerinit
|
||||
@@ -29,5 +29,7 @@ else
|
||||
exit 1
|
||||
fi
|
||||
|
||||
+/usr/bin/strip -s $DEST/dockerinit-$VERSION
|
||||
+
|
||||
# sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another
|
||||
export DOCKER_INITSHA1=$($sha1sum "$DEST/dockerinit-$VERSION" | cut -d' ' -f1)
|
||||
Loading…
Reference in New Issue
Block a user