From 0ab70b9cb7a4a7cbce5fe0c5366e03d7fc47b3b0 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Wed, 29 Nov 2017 16:34:34 -0800 Subject: [PATCH] Resolve comments --- .../tools/docker/alpine_artifact/Dockerfile | 2 +- .../artifacts/build_all_linux_artifacts.sh | 4 ++-- .../run_tests/artifacts/build_artifact_node.sh | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/packages/grpc-native-core/tools/docker/alpine_artifact/Dockerfile b/packages/grpc-native-core/tools/docker/alpine_artifact/Dockerfile index 7898a08d..0674654a 100644 --- a/packages/grpc-native-core/tools/docker/alpine_artifact/Dockerfile +++ b/packages/grpc-native-core/tools/docker/alpine_artifact/Dockerfile @@ -1,2 +1,2 @@ FROM node:8-alpine -RUN apk add --no-cache python curl bash build-base \ No newline at end of file +RUN apk add --no-cache python curl bash build-base diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_all_linux_artifacts.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_all_linux_artifacts.sh index 9d3332b8..2d34d4d7 100755 --- a/packages/grpc-native-core/tools/run_tests/artifacts/build_all_linux_artifacts.sh +++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_all_linux_artifacts.sh @@ -31,8 +31,8 @@ mkdir -p "${ARTIFACTS_OUT}" docker build -t alpine_node_artifact $base_dir/tools/docker/alpine_artifact -$tool_dir/build_artifact_node.sh false +$tool_dir/build_artifact_node.sh $tool_dir/build_artifact_node_arm.sh -docker run -e ARTIFACTS_OUT=/var/grpc/artifacts -v $base_dir:/var/grpc alpine_node_artifact bash -c /var/grpc/tools/run_tests/artifacts/build_artifact_node.sh true +docker run -e ARTIFACTS_OUT=/var/grpc/artifacts -v $base_dir:/var/grpc alpine_node_artifact bash -c /var/grpc/tools/run_tests/artifacts/build_artifact_node.sh --with-alpine diff --git a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh index 7eaf506d..d8128863 100755 --- a/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh +++ b/packages/grpc-native-core/tools/run_tests/artifacts/build_artifact_node.sh @@ -13,6 +13,23 @@ # See the License for the specific language governing permissions and # limitations under the License. +NODE_ALPINE_BUILD=false + +while true ; do + case $1 in + --with-alpine) + NODE_ALPINE_BUILD=true + ;; + "") + ;; + *) + echo "Unknown parameter: $1" + exit 1 + ;; + esac + shift || break +done + NODE_ALPINE_BUILD=$1 umask 022