Remove advanced.yml

README.md

@@ -36,8 +36,8 @@ streaming example.
 From the repo root directory:
 
 ```sh
-$ docker-compose pull
-$ docker-compose up
+$ docker-compose pull node-server envoy commonjs-client
+$ docker-compose up node-server envoy commonjs-client
 ```
 
 Open a browser tab, and go to:
@@ -311,14 +311,14 @@ $ docker-compose up -d node-server envoy commonjs-client
 An alternative is to build Nginx that comes with this repository.
 
 ```sh
-$ docker-compose -f advanced.yml up -d echo-server nginx closure-client
+$ docker-compose up -d echo-server nginx closure-client
 ```
 
 You can also try this
 [gRPC-Web Go Proxy](https://github.com/improbable-eng/grpc-web/tree/master/go/grpcwebproxy).
 
 ```sh
-$ docker-compose -f advanced.yml up -d node-server grpcwebproxy binary-client
+$ docker-compose up -d node-server grpcwebproxy binary-client
 ```
 
 ## Acknowledgement

advanced.yml

@@ -1,115 +0,0 @@
-version: '3'
-services:
-  common:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/common/Dockerfile
-    image: grpcweb/common
-  prereqs:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/prereqs/Dockerfile
-    depends_on:
-      - common
-    image: grpcweb/prereqs
-  echo-server:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/echo_server/Dockerfile
-    depends_on:
-      - prereqs
-    image: grpcweb/echo-server
-    ports:
-      - "9090:9090"
-  node-server:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/node_server/Dockerfile
-    depends_on:
-      - common
-    image: grpcweb/node-server
-    ports:
-      - "9090:9090"
-  node-interop-server:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/node_interop_server/Dockerfile
-    depends_on:
-      - common
-    image: grpcweb/node-interop-server
-    ports:
-      - "7074:7074"
-  envoy:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/envoy/Dockerfile
-    image: grpcweb/envoy
-    ports:
-      - "8080:8080"
-    links:
-      - node-server
-  nginx:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/nginx/Dockerfile
-    depends_on:
-      - prereqs
-    image: grpcweb/nginx
-    ports:
-      - "8080:8080"
-    links:
-      - echo-server
-  grpcwebproxy:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/grpcwebproxy/Dockerfile
-    image: grpcweb/grpcwebproxy
-    ports:
-      - "8080:8080"
-    links:
-      - node-server
-  commonjs-client:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/commonjs_client/Dockerfile
-    depends_on:
-      - common
-    image: grpcweb/commonjs-client
-    ports:
-      - "8081:8081"
-  closure-client:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/closure_client/Dockerfile
-    depends_on:
-      - prereqs
-    image: grpcweb/closure-client
-    ports:
-      - "8081:8081"
-  ts-client:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/ts_client/Dockerfile
-    depends_on:
-      - prereqs
-    image: grpcweb/ts-client
-    ports:
-      - "8081:8081"
-  binary-client:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/binary_client/Dockerfile
-    depends_on:
-      - prereqs
-    image: grpcweb/binary-client
-    ports:
-      - "8081:8081"
-  interop-client:
-    build:
-      context: ./
-      dockerfile: ./net/grpc/gateway/docker/interop_client/Dockerfile
-    depends_on:
-      - prereqs
-    image: grpcweb/interop-client
-    ports:
-      - "8081:8081"

docker-compose.yml

@@ -5,6 +5,22 @@ services:
       context: ./
       dockerfile: ./net/grpc/gateway/docker/common/Dockerfile
     image: grpcweb/common
+  prereqs:
+    build:
+      context: ./
+      dockerfile: ./net/grpc/gateway/docker/prereqs/Dockerfile
+    depends_on:
+      - common
+    image: grpcweb/prereqs
+  echo-server:
+    build:
+      context: ./
+      dockerfile: ./net/grpc/gateway/docker/echo_server/Dockerfile
+    depends_on:
+      - prereqs
+    image: grpcweb/echo-server
+    ports:
+      - "9090:9090"
   node-server:
     build:
       context: ./
@@ -14,6 +30,15 @@ services:
     image: grpcweb/node-server
     ports:
       - "9090:9090"
+  node-interop-server:
+    build:
+      context: ./
+      dockerfile: ./net/grpc/gateway/docker/node_interop_server/Dockerfile
+    depends_on:
+      - common
+    image: grpcweb/node-interop-server
+    ports:
+      - "7074:7074"
   envoy:
     build:
       context: ./
@@ -23,6 +48,26 @@ services:
       - "8080:8080"
     links:
       - node-server
+  nginx:
+    build:
+      context: ./
+      dockerfile: ./net/grpc/gateway/docker/nginx/Dockerfile
+    depends_on:
+      - prereqs
+    image: grpcweb/nginx
+    ports:
+      - "8080:8080"
+    links:
+      - echo-server
+  grpcwebproxy:
+    build:
+      context: ./
+      dockerfile: ./net/grpc/gateway/docker/grpcwebproxy/Dockerfile
+    image: grpcweb/grpcwebproxy
+    ports:
+      - "8080:8080"
+    links:
+      - node-server
   commonjs-client:
     build:
       context: ./
@@ -32,3 +77,39 @@ services:
     image: grpcweb/commonjs-client
     ports:
       - "8081:8081"
+  closure-client:
+    build:
+      context: ./
+      dockerfile: ./net/grpc/gateway/docker/closure_client/Dockerfile
+    depends_on:
+      - prereqs
+    image: grpcweb/closure-client
+    ports:
+      - "8081:8081"
+  ts-client:
+    build:
+      context: ./
+      dockerfile: ./net/grpc/gateway/docker/ts_client/Dockerfile
+    depends_on:
+      - prereqs
+    image: grpcweb/ts-client
+    ports:
+      - "8081:8081"
+  binary-client:
+    build:
+      context: ./
+      dockerfile: ./net/grpc/gateway/docker/binary_client/Dockerfile
+    depends_on:
+      - prereqs
+    image: grpcweb/binary-client
+    ports:
+      - "8081:8081"
+  interop-client:
+    build:
+      context: ./
+      dockerfile: ./net/grpc/gateway/docker/interop_client/Dockerfile
+    depends_on:
+      - prereqs
+    image: grpcweb/interop-client
+    ports:
+      - "8081:8081"

scripts/kokoro.sh

@@ -70,11 +70,10 @@ cd packages/grpc-web && \
 # Build all relevant docker images. They should all build successfully.
 if [[ "$MASTER" == "1" ]]; then
   # Build all for continuous_integration
-  docker-compose -f advanced.yml build
+  docker-compose build
 else
   # Only build a subset of necessary docker images for presubmit runs
-  docker-compose -f advanced.yml build common prereqs envoy \
-    node-server node-interop-server
+  docker-compose build common prereqs envoy node-server node-interop-server
 fi
 
 

test/interop/README.md

@@ -13,7 +13,7 @@ Run interop tests
 
 ```sh
 $ cd grpc-web
-$ docker-compose -f advanced.yml build common prereqs node-interop-server interop-client
+$ docker-compose build common prereqs node-interop-server interop-client
 ```
 
 
@@ -49,7 +49,7 @@ $ docker run --network=host --rm grpcweb/prereqs /bin/bash \
 Or from the browser:
 
 ```sh
-$ docker-compose -f advanced.yml up interop-client
+$ docker-compose up interop-client
 ```
 
 Open up the browser and go to `http://localhost:8081/index.html` and open up