Revert "add the :Z option to all mounted volumes so that discourse works when selinux...
authorSam Saffron <sam.saffron@gmail.com>
Sat, 12 Aug 2017 01:56:45 +0000 (21:56 -0400)
committerSam Saffron <sam.saffron@gmail.com>
Sat, 12 Aug 2017 01:56:45 +0000 (21:56 -0400)
This reverts commit 2b0b0938c475b8886ee14f66e8b16f403ca8213a.

launcher

index 687557b81c7aedc64ebbd7869a66f8fceeca4d82..0a90baa27d643a7e5715f06288b54a1aff020daf 100755 (executable)
--- 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() {