alunduil 15/07/04 23:14:50
Modified: docker-r2.initd docker.service
Added: docker.initd 7179-add-audit_write-cap.patch
docker-r3.confd docker-r3.initd
Log:
add version 1.6.2
fixes bug #553706
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
11A8217C!)
Revision Changes Path
1.2 app-emulation/docker/files/docker-r2.initd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker-r2.initd?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker-r2.initd?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker-r2.initd?r1=1.1&r2=1.2
Index: docker-r2.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/files/docker-r2.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docker-r2.initd 25 Sep 2013 03:22:15 -0000 1.1
+++ docker-r2.initd 4 Jul 2015 23:14:50 -0000 1.2
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/app-emulation/docker/files/docker-r2.initd,v 1.1
2013/09/25 03:22:15 gregkh Exp $
+# $Header:
/var/cvsroot/gentoo-x86/app-emulation/docker/files/docker-r2.initd,v 1.2
2015/07/04 23:14:50 alunduil Exp $
DOCKER_LOGFILE=${DOCKER_LOGFILE:-/var/log/${SVCNAME}.log}
DOCKER_PIDFILE=${DOCKER_PIDFILE:-/run/${SVCNAME}.pid}
@@ -10,9 +10,7 @@
DOCKER_WORKAROUND_1422_DELAY=${DOCKER_WORKAROUND_1422_DELAY:-1}
start() {
- touch "$DOCKER_LOGFILE"
- chown root:docker "$DOCKER_LOGFILE"
- chmod 0644 "$DOCKER_LOGFILE"
+ checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
ebegin "Starting docker daemon"
start-stop-daemon --start --background \
1.2 app-emulation/docker/files/docker.service
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker.service?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker.service?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker.service?r1=1.1&r2=1.2
Index: docker.service
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/docker/files/docker.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- docker.service 25 Sep 2013 03:22:15 -0000 1.1
+++ docker.service 4 Jul 2015 23:14:50 -0000 1.2
@@ -1,5 +1,5 @@
[Unit]
-Description=Docker - The Linux Container Engine
+Description=Easily create lightweight, portable, self-sufficient containers
from any application!
Requires=network.target
After=multi-user.target
@@ -7,7 +7,6 @@
Type=simple
ExecStartPre=/bin/mount --make-rprivate /
ExecStart=/usr/bin/docker -d
-TimeoutSec=60
[Install]
WantedBy=multi-user.target
1.3 app-emulation/docker/files/docker.initd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker.initd?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker.initd?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker.initd?r1=1.2&r2=1.3
1.1 app-emulation/docker/files/7179-add-audit_write-cap.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/7179-add-audit_write-cap.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/7179-add-audit_write-cap.patch?rev=1.1&content-type=text/plain
Index: 7179-add-audit_write-cap.patch
===================================================================
>From 29ecc95c31ecfe15e3b3d8db94cea1c555e526a3 Mon Sep 17 00:00:00 2001
From: Alexandr Morozov <[email protected]>
Date: Wed, 23 Jul 2014 09:57:41 +0400
Subject: [PATCH] Add AUDIT_WRITE cap
Fixes #6345
Thanks @larsks for outstanding investigation
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <[email protected]> (github:
LK4D4)
---
daemon/execdriver/native/template/default_template.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/daemon/execdriver/native/template/default_template.go
b/daemon/execdriver/native/template/default_template.go
index cc5cc4f..be3dd5a 100644
--- a/daemon/execdriver/native/template/default_template.go
+++ b/daemon/execdriver/native/template/default_template.go
@@ -23,6 +23,7 @@ func New() *libcontainer.Config {
"NET_BIND_SERVICE",
"SYS_CHROOT",
"KILL",
+ "AUDIT_WRITE",
},
Namespaces: map[string]bool{
"NEWNS": true,
--
2.0.3
1.1 app-emulation/docker/files/docker-r3.confd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker-r3.confd?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker-r3.confd?rev=1.1&content-type=text/plain
Index: docker-r3.confd
===================================================================
# /etc/conf.d/docker: config file for /etc/init.d/docker
# where the docker daemon output gets piped
#DOCKER_LOGFILE="/var/log/docker.log"
# where docker's pid get stored
#DOCKER_PIDFILE="/run/docker.pid"
# where the docker daemon itself is run from
#DOCKER_BINARY="/usr/bin/docker"
# any other random options you want to pass to docker
DOCKER_OPTS=""
1.1 app-emulation/docker/files/docker-r3.initd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker-r3.initd?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/docker/files/docker-r3.initd?rev=1.1&content-type=text/plain
Index: docker-r3.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/files/docker-r3.initd,v
1.1 2015/07/04 23:14:50 alunduil Exp $
DOCKER_LOGFILE=${DOCKER_LOGFILE:-/var/log/${SVCNAME}.log}
DOCKER_PIDFILE=${DOCKER_PIDFILE:-/run/${SVCNAME}.pid}
DOCKER_BINARY=${DOCKER_BINARY:-/usr/bin/docker}
DOCKER_OPTS=${DOCKER_OPTS:-}
start() {
checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
ebegin "Starting docker daemon"
start-stop-daemon --start --background \
--exec "$DOCKER_BINARY" \
--pidfile "$DOCKER_PIDFILE" \
--stdout "$DOCKER_LOGFILE" \
--stderr "$DOCKER_LOGFILE" \
-- -d -p "$DOCKER_PIDFILE" \
$DOCKER_OPTS
eend $?
}
stop() {
ebegin "Stopping docker daemon"
start-stop-daemon --stop \
--exec "$DOCKER_BINARY" \
--pidfile "$DOCKER_PIDFILE"
eend $?
}
