[REV] support parse ARG variable value

goodrain · Mar 5, 2019 · 260f551 · 260f551
1 parent 81c7f10
commit 260f551
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/builder/build/dockerfile_build.go b/builder/build/dockerfile_build.go
@@ -27,6 +27,7 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/goodrain/rainbond/builder"
 	"github.com/goodrain/rainbond/builder/sources"
+	"github.com/goodrain/rainbond/util"
 )
 
 func dockerfileBuilder() (Build, error) {
@@ -86,16 +87,23 @@ func (d *dockerfileBuild) Build(re *Request) (*Response, error) {
 	}, nil
 }
 
+//GetARGs get args and parse value
 func GetARGs(buildEnvs map[string]string) map[string]*string {
-	args := make(map[string]*string, 5)
+	args := make(map[string]*string)
+	argStr := make(map[string]string)
 	for k, v := range buildEnvs {
 		if strings.Replace(v, " ", "", -1) == "" {
 			continue
 		}
 		if ks := strings.Split(k, "ARG_"); len(ks) > 1 {
 			value := v
 			args[ks[1]] = &value
+			argStr[ks[1]] = value
 		}
 	}
+	for k, arg := range args {
+		value := util.ParseVariable(*arg, argStr)
+		args[k] = &value
+	}
 	return args
 }
diff --git a/hack/contrib/docker/gateway/nginxtmp/tmpl/nginx.tmpl b/hack/contrib/docker/gateway/nginxtmp/tmpl/nginx.tmpl
@@ -101,7 +101,6 @@ http {
         server 0.0.0.1; # placeholder
 
         balancer_by_lua_block {
-          ngx.log(ngx.INFO, string.format("start balancer"))
           balancer.balance()
         }
     }