[docker-io/f19] Increment release tag
by Lokesh Mandvekar
commit 23e94958fc3f995a1c07c865640bd82d8a15684c
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Aug 5 10:45:45 2014 -0500
Increment release tag
docker-io.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 9469a68..d9dfbef 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -11,7 +11,7 @@
Name: docker-io
Version: 1.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch1: upstream-patched-archive-tar.patch
9 years, 9 months
[docker-io/f19] Resolves: rhbz#1122434 - disable selinux for f19
by Lokesh Mandvekar
commit de28f1fef51dbdcd636fe723b5956ce6d7efaf49
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Tue Aug 5 10:43:36 2014 -0500
Resolves: rhbz#1122434 - disable selinux for f19
docker-io.spec | 7 ++++++-
docker.sysconfig | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 530d23e..9469a68 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -173,7 +173,9 @@ mkdir -p ./_build/src/github.com/dotcloud
ln -s $(pwd) ./_build/src/github.com/dotcloud/docker
export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
-export DOCKER_BUILDTAGS='selinux'
+# rhbz#1122434 disable selinux for f19 since the required policy has not been
+# backported
+#export DOCKER_BUILDTAGS='selinux'
export GOPATH=$(pwd)/_build:%{gopath}
hack/make.sh dynbinary
@@ -446,6 +448,9 @@ exit 0
%{gopath}/src/%{import_path}/pkg/version/*.go
%changelog
+* Tue Aug 05 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.1.2-3
+- Resolves:rhbz#1122434 - Disable selinux for f19
+
* Fri Aug 01 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.1.2-2
- change %else if -> %else %if
diff --git a/docker.sysconfig b/docker.sysconfig
index e5f99cb..65f306a 100644
--- a/docker.sysconfig
+++ b/docker.sysconfig
@@ -1,2 +1,2 @@
# /etc/sysconfig/docker
-OPTIONS=--selinux-enabled
+OPTIONS=
9 years, 9 months