Merge pull request grpc#274 from stanley-cheung/master

Slight refactor
The-Peso-G · Aug 30, 2018 · c87aa4f · c87aa4f
2 parents 2303ad5 + c0a6185
commit c87aa4f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/net/grpc/gateway/docker/binary_client/Dockerfile b/net/grpc/gateway/docker/binary_client/Dockerfile
@@ -28,7 +28,6 @@ RUN cd $EXAMPLE_DIR/commonjs-example && \
   npm install && \
   npm link grpc-web && \
   npx webpack && \
-  mkdir -p /var/www/html/dist && \
   cp echotest.html /var/www/html && \
   cp dist/main.js /var/www/html/dist
 

diff --git a/net/grpc/gateway/docker/common/Dockerfile b/net/grpc/gateway/docker/common/Dockerfile
@@ -32,4 +32,5 @@ RUN cd /github/grpc-web/packages/grpc-web && \
   npm link
 
 RUN cp /github/grpc-web/net/grpc/gateway/examples/echo/nginx_simple.conf \
-  /etc/nginx/nginx.conf
+  /etc/nginx/nginx.conf && \
+  mkdir -p /var/www/html/dist
diff --git a/net/grpc/gateway/docker/commonjs_client/Dockerfile b/net/grpc/gateway/docker/commonjs_client/Dockerfile
@@ -26,7 +26,6 @@ RUN cd $EXAMPLE_DIR/commonjs-example && \
   npm install && \
   npm link grpc-web && \
   npx webpack && \
-  mkdir -p /var/www/html/dist && \
   cp echotest.html /var/www/html && \
   cp dist/main.js /var/www/html/dist
 

diff --git a/net/grpc/gateway/docker/ts_client/Dockerfile b/net/grpc/gateway/docker/ts_client/Dockerfile
@@ -27,7 +27,6 @@ RUN cd $EXAMPLE_DIR/ts-example && \
   npm link grpc-web && \
   tsc && \
   npx webpack && \
-  mkdir -p /var/www/html/dist && \
   cp echotest.html /var/www/html && \
   cp dist/main.js /var/www/html/dist