From: Sam Saffron <sam.saffron@gmail.com>
Date: Sat, 12 Aug 2017 01:56:45 +0000 (-0400)
Subject: Revert "add the :Z option to all mounted volumes so that discourse works when selinux... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=02d9a654664b3c7fdb518780c6a61c21e208d169;p=discourse_docker.git

Revert "add the :Z option to all mounted volumes so that discourse works when selinux is enabled"

This reverts commit 2b0b0938c475b8886ee14f66e8b16f403ca8213a.
---

diff --git a/launcher b/launcher
index 687557b..0a90baa 100755
--- a/launcher
+++ b/launcher
@@ -252,12 +252,8 @@ RUBY
 
 
 set_volumes() {
-  local volopts=
-  if selinuxenabled; then
-      volopts=":Z"
-  fi
   volumes=`cat $config_file | $docker_path run $user_args --rm -i -a stdout -a stdin $image ruby -e \
-        "require 'yaml'; puts YAML.load(STDIN.readlines.join)['volumes'].map{|v| '-v ' << v['volume']['host'] << ':' << v['volume']['guest'] << '${volopts} '}.join"`
+        "require 'yaml'; puts YAML.load(STDIN.readlines.join)['volumes'].map{|v| '-v ' << v['volume']['host'] << ':' << v['volume']['guest'] << ' '}.join"`
 }
 
 set_links() {