commit 3407f4ee223a1a0dabef04bbd434aafa6b5bfa5c
Author: Lokesh Mandvekar <[email protected]>
Date: Fri Jan 16 17:06:40 2015 +0000
docker group and socket activation not used
NVR: docker-io-1.4.1-7
- sysconfig file updates
Signed-off-by: Lokesh Mandvekar <[email protected]>
docker-io.spec | 13 ++++++++-----
docker.service | 3 +--
docker.sysconfig | 6 +++++-
3 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 473f8dd..c7ac141 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -17,7 +17,7 @@
Name: %{repo}-io
Version: 1.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -296,7 +296,6 @@ install -d %{buildroot}%{_sharedstatedir}/%{repo}
# install systemd/init scripts
install -d %{buildroot}%{_unitdir}
install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
-install -p -m 644 contrib/init/systemd/%{repo}.socket %{buildroot}%{_unitdir}
# for additional args
install -d %{buildroot}%{_sysconfdir}/sysconfig/
@@ -335,8 +334,7 @@ install -dp %{buildroot}%{_sysconfdir}/%{repo}
}
%pre
-getent group docker > /dev/null || %{_sbindir}/groupadd -r docker
-getent passwd dockerroot > /dev/null || %{_sbindir}/useradd -r -g docker -d
%{_sharedstatedir}/docker -s /sbin/nologin -c "Docker User" dockerroot
+getent passwd dockerroot > /dev/null || %{_sbindir}/useradd -r -d
%{_sharedstatedir}/docker -s /sbin/nologin -c "Docker User" dockerroot
exit 0
%post
@@ -359,7 +357,6 @@ exit 0
%{_bindir}/docker
%{_libexecdir}/docker
%{_unitdir}/docker.service
-%{_unitdir}/docker.socket
%{_datadir}/bash-completion/completions/docker
%dir %{_sharedstatedir}/docker
%{_sysconfdir}/udev/rules.d/80-docker.rules
@@ -393,6 +390,12 @@ exit 0
%{_datadir}/zsh/site-functions/_docker
%changelog
+* Fri Jan 16 2015 Lokesh Mandvekar <[email protected]> - 1.4.1-7
+- docker group no longer used or created
+- no socket activation
+- config file updates to include info about docker_transition_unconfined
+boolean
+
* Fri Jan 16 2015 Lokesh Mandvekar <[email protected]> - 1.4.1-6
- run tests inside a docker repo (doesn't affect koji builds - not built)
diff --git a/docker.service b/docker.service
index 2f35eab..76988e6 100644
--- a/docker.service
+++ b/docker.service
@@ -1,8 +1,7 @@
[Unit]
Description=Docker Application Container Engine
Documentation=http://docs.docker.com
-After=network.target docker.socket
-Requires=docker.socket
+After=network.target
[Service]
Type=notify
diff --git a/docker.sysconfig b/docker.sysconfig
index 34634f9..da2e4d3 100644
--- a/docker.sysconfig
+++ b/docker.sysconfig
@@ -1,9 +1,13 @@
# /etc/sysconfig/docker
# Modify these options if you want to change the way the docker daemon runs
-OPTIONS='--selinux-enabled -H fd://'
+OPTIONS='--selinux-enabled'
DOCKER_CERT_PATH=/etc/docker
+# On SELinux System, if you remove the --selinux-enabled option, you
+# also need to turn on the docker_transition_unconfined boolean.
+# setsebool -P docker_transition_unconfined
+
# Location used for temporary files, such as those created by
# docker load and build operations. Default is /var/lib/docker/tmp
# Can be overriden by setting the following environment variable.
_______________________________________________
golang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/golang
