Explorar el Código

允许未配置GIT_PROXY的情况下编译

曹文涛 hace 3 años
padre
commit
779ca39b49
Se han modificado 1 ficheros con 18 adiciones y 8 borrados
  1. 18 8
      build

+ 18 - 8
build

@@ -135,14 +135,24 @@ make_zip() {
 make_docker() {
     EMQX_BUILDER="${EMQX_BUILDER:-${EMQX_DEFAULT_BUILDER}}"
     EMQX_RUNNER="${EMQX_RUNNER:-${EMQX_DEFAULT_RUNNER}}"
-    set -x
-    docker build --no-cache --pull \
-       --build-arg BUILD_FROM="${EMQX_BUILDER}" \
-       --build-arg RUN_FROM="${EMQX_RUNNER}" \
-       --build-arg EMQX_NAME="$PROFILE" \
-       --build-arg PROXY="${GIT_PROXY}" \
-       --tag "emqx/$PROFILE:${PKG_VSN}" \
-       -f "${DOCKERFILE}" .
+    if (set -u; : "$GIT_PROXY"); then
+      set -x
+      docker build --no-cache --pull \
+         --build-arg BUILD_FROM="${EMQX_BUILDER}" \
+         --build-arg RUN_FROM="${EMQX_RUNNER}" \
+         --build-arg EMQX_NAME="$PROFILE" \
+         --build-arg PROXY="${GIT_PROXY}" \
+         --tag "emqx/$PROFILE:${PKG_VSN}" \
+         -f "${DOCKERFILE}" .
+    else
+      set -x
+      docker build --no-cache --pull \
+         --build-arg BUILD_FROM="${EMQX_BUILDER}" \
+         --build-arg RUN_FROM="${EMQX_RUNNER}" \
+         --build-arg EMQX_NAME="$PROFILE" \
+         --tag "emqx/$PROFILE:${PKG_VSN}" \
+         -f "${DOCKERFILE}" .
+    fi
 }
 
 log "building artifact=$ARTIFACT for profile=$PROFILE"