From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Tue, 27 Dec 2016 20:12:03 +0000 (-0200)
Subject: Move --docker-args to the end so it gets priority
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e00fca6ef9e0f06e08705108fc26e7775dc19d3d;p=discourse_docker.git

Move --docker-args to the end so it gets priority
---

diff --git a/launcher b/launcher
index c58d1db..e7ae6b6 100755
--- a/launcher
+++ b/launcher
@@ -517,8 +517,8 @@ run_start() {
      fi
 
      set -x
-     $docker_path run $user_args $links $attach_on_run $restart_policy "${env[@]}" "${labels[@]}" -h "$hostname" \
-        -e DOCKER_HOST_IP=$docker_ip --name $config -t $ports $volumes $mac_address $docker_args \
+     $docker_path run $links $attach_on_run $restart_policy "${env[@]}" "${labels[@]}" -h "$hostname" \
+        -e DOCKER_HOST_IP=$docker_ip --name $config -t $ports $volumes $mac_address $docker_args $user_args \
         $run_image $boot_command
 
    )