commit 6c9e373ee06cb1aee07d3cae426c46002663010d
Author: Lokesh Mandvekar <[email protected]>
Date: Thu Jan 8 17:04:38 2015 +0000
tests and unitfile updates
NVR: docker-io-1.4.1-4
- run tests in check if docker already running
- own /etc/docker
unitfile changes
- MountFlags=private
- allow DOCKER_NETWORK_OPTIONS from /etc/sysconfig/docker
Signed-off-by: Lokesh Mandvekar <[email protected]>
docker-io.spec | 19 +++++++++++++++----
docker-network.sysconfig | 1 +
docker.service | 4 +++-
docker.sysconfig | 3 ++-
4 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 96a6e28..d38a094 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -17,7 +17,7 @@
Name: %{repo}-io
Version: 1.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: http://www.docker.com
@@ -229,9 +229,6 @@ This package installs %{summary}.
%prep
%setup -qn %{repo}-%{version}
rm -rf
vendor/src/github.com/{coreos,docker/libtrust,godbus,gorilla,kr,Sirupsen,syndtr,tchap}
-#find . -name "*.go" \
-# -print |\
-# xargs sed -i
's/github.com\/docker\/docker\/vendor\/src\/code.google.com\/p\/go\/src\/pkg\///g'
cp %{SOURCE5} .
%build
@@ -321,6 +318,12 @@ done
install -d -p
%{buildroot}%{gopath}/src/%{import_path}/vendor/src/%{tar_import_path}
cp -rpav vendor/src/%{tar_import_path}/*
%{buildroot}%{gopath}/src/%{import_path}/vendor/src/%{tar_import_path}
+# install docker config directory
+install -dp %{buildroot}%{_sysconfdir}/%{repo}
+
+%check
+[ ! -e /run/docker.sock ] || make test
+
%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
@@ -350,6 +353,7 @@ exit 0
%{_datadir}/bash-completion/completions/docker
%dir %{_sharedstatedir}/docker
%{_sysconfdir}/udev/rules.d/80-docker.rules
+%{_sysconfdir}/docker
%files devel
%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md
@@ -379,6 +383,13 @@ exit 0
%{_datadir}/zsh/site-functions/_docker
%changelog
+* Thu Jan 08 2015 Lokesh Mandvekar <[email protected]> - 1.4.1-4
+- allow unitfile to use /etc/sysconfig/docker-network
+- MountFlags private
+
+* Fri Dec 19 2014 Dan Walsh <[email protected]> - 1.4.1-3
+- Add check to run unit tests
+
* Thu Dec 18 2014 Lokesh Mandvekar <[email protected]> - 1.4.1-2
- update and rename logrotate cron script
- install /etc/sysconfig/docker-network
diff --git a/docker-network.sysconfig b/docker-network.sysconfig
index 51710bf..048d158 100644
--- a/docker-network.sysconfig
+++ b/docker-network.sysconfig
@@ -1 +1,2 @@
# /etc/sysconfig/docker-network
+DOCKER_NETWORK_OPTIONS=
diff --git a/docker.service b/docker.service
index 10c7e15..2f35eab 100644
--- a/docker.service
+++ b/docker.service
@@ -8,9 +8,11 @@ Requires=docker.socket
Type=notify
EnvironmentFile=-/etc/sysconfig/docker
EnvironmentFile=-/etc/sysconfig/docker-storage
-ExecStart=/usr/bin/docker -d -H fd:// $OPTIONS $DOCKER_STORAGE_OPTIONS
+EnvironmentFile=-/etc/sysconfig/docker-network
+ExecStart=/usr/bin/docker -d $OPTIONS $DOCKER_STORAGE_OPTIONS
$DOCKER_NETWORK_OPTIONS
LimitNOFILE=1048576
LimitNPROC=1048576
+MountFlags=private
[Install]
WantedBy=multi-user.target
diff --git a/docker.sysconfig b/docker.sysconfig
index a3e40f7..34634f9 100644
--- a/docker.sysconfig
+++ b/docker.sysconfig
@@ -1,7 +1,8 @@
# /etc/sysconfig/docker
# Modify these options if you want to change the way the docker daemon runs
-OPTIONS='--selinux-enabled'
+OPTIONS='--selinux-enabled -H fd://'
+DOCKER_CERT_PATH=/etc/docker
# Location used for temporary files, such as those created by
# docker load and build operations. Default is /var/lib/docker/tmp
_______________________________________________
golang mailing list
[email protected]
https://lists.fedoraproject.org/mailman/listinfo/golang
