Add docker_args to YAML syntax (fix #175)

Also update main sample YAML.

diff --git a/launcher b/launcher
index 0de14df3ad7159168161705b5c9a34a4e2d3e1e3..c06f2308878ecc07c5504f99bf90ea97ae82490d 100755 (executable)
--- a/launcher
+++ b/launcher
@@ -401,6 +401,9 @@ run_start(){
    ports=`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)['expose'].map{|p| '-p ' << p.to_s << ' '}.join"`
 
+   docker_args=`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)['docker_args']"`
+
    set_template_info
    set_volumes
    set_links
@@ -409,7 +412,8 @@ run_start(){
      hostname=`hostname`
      set -x
      $docker_path run $user_args $links $attach_on_run $restart_policy "${env[@]}" -h "$hostname-$config" \
-        -e DOCKER_HOST_IP=$docker_ip --name $config -t $ports $volumes $local_discourse/$config /sbin/boot
+        -e DOCKER_HOST_IP=$docker_ip --name $config -t $ports $volumes $docker_args $local_discourse/$config \
+        /sbin/boot
 
    )
    exit 0

diff --git a/samples/standalone.yml b/samples/standalone.yml
index cac5c7399f627796814eb6f116d156ed1bce38a1..a2da593952251995f47d9ce769a1f20ca742edcd 100644 (file)
--- a/samples/standalone.yml
+++ b/samples/standalone.yml
@@ -25,6 +25,9 @@ expose:
   - "80:80"   # fwd host port 80   to container port 80 (http)
   - "2222:22" # fwd host port 2222 to container port 22 (ssh)
 
+# any extra arguments for Docker?
+# docker_args:
+
 params:
   db_default_text_search_config: "pg_catalog.english"