Merge pull request #2 from docker/comanagefix

Added some fix to resolv starting issues in docker comanage
docker · Sep 12, 2016 · 2f71915 · 2f71915
2 parents 38fb350 + 8bdd645
commit 2f71915
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/container_files/bin/configure_http.sh → container_files/bin/configure_httpd.sh b/container_files/bin/configure_http.sh → container_files/bin/configure_httpd.sh
diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh
@@ -17,7 +17,7 @@ then
       echo "COmanage was configured"
       echo "Starting apache" >>$log
       echo "Starting apache"
-      /usr/local/bin/httpd-shib-foreground &
+      /usr/local/bin/httpd-shib-foreground 
   fi
 else
   echo "Composed so waiting for MariaDB: " > $log
@@ -29,5 +29,5 @@ else
   date >> $log
   echo "Starting apache" >>$log
   echo "Starting apache"  
-  /usr/local/bin/httpd-shib-foreground &
-fi
+  /usr/local/bin/httpd-shib-foreground 
+fi