Update to mds/bootstrap/docker-compose-setup-network.yml

Author: rich-dtk

cmds/bootstrap/docker-compose-setup-network.yml

@@ -13,39 +13,45 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-version: '2'
-services:
-  ######  dynamic configuration  ###########
+version: '3'
 
+services:
   generate-raw-addresses:
-    build: dockerfiles/tools
-    command: bash -c "/bin-mount/generate-raw-addresses-if-needed 50 /addresses/raw-addresses.txt /addresses/addresses.yaml"
+    image: techbureau/catapult-tools-private:gcc-master-6b1a810a33
+    command: bash -c "/bin-mount/generate-raw-addresses-if-needed 53 /addresses/raw-addresses.txt /addresses/addresses.yaml"
     volumes:
     - ../../bin/bash:/bin-mount
     - ../../build/generated-addresses:/addresses:rw
     - ../../build/state:/state:rw
 
   store-addresses:
-    build: dockerfiles/ruby-alpine
-    command: ash -c "/bin-mount/wait /addresses/raw-addresses.txt && /ruby/bin/store-addresses-if-needed.rb /addresses/raw-addresses.txt /addresses/addresses.yaml"
+    build:
+      context: ../../ruby
+      dockerfile: Dockerfile-dev
+#    command: bash -c "sleep infinity"
+    command: bash -c "/bin-mount/wait /addresses/raw-addresses.txt && /usr/app/bin/store-addresses-if-needed.rb /addresses/raw-addresses.txt /addresses/addresses.yaml 53"
     volumes:
-    - ../../bin/ash:/bin-mount
-    - ../../ruby:/ruby
+    - ../../bin/bash:/bin-mount
+    - ../../ruby:/usr/app
     - ../../build/generated-addresses:/addresses:rw
 
-  generate-configs:
-    build: dockerfiles/ruby-alpine
-    command: ash -c "/bin-mount/wait /addresses/addresses.yaml && /ruby/bin/generate-and-write-configurations.rb /addresses/addresses.yaml /config-build /nemesis && touch /state/configs-generated"
+  setup-network:
+    build:
+      context: ../../ruby
+      dockerfile: Dockerfile-dev
+#    command: bash -c "sleep infinity"
+    command: bash -c "/bin-mount/wait /addresses/addresses.yaml && /usr/app/bin/generate-and-write-configurations.rb /addresses/addresses.yaml /config-build /nemesis && touch /state/configs-generated"
     volumes:
-    - ../../bin/ash:/bin-mount
-    - ../../ruby:/ruby
+    - ../../bin/bash:/bin-mount
+    - ../../ruby:/usr/app
     - ../../build/generated-addresses:/addresses
     - ../../build/catapult-config:/config-build
     - ../../build/nemesis:/nemesis:rw
     - ../../build/state:/state:rw
-  
+
   peer-node-0-nemgen:
     build: dockerfiles/nemgen
+#    command: bash -c "sleep infinity"
     command: bash -c "/bin-mount/wait /state/configs-generated && /bin/bash /userconfig/nemgen.sh && touch /state/peer-node-0-nemgen"
     stop_signal: SIGINT
     volumes:
@@ -55,7 +61,7 @@ services:
     - ../../bin/bash:/bin-mount
     - ../../build/state:/state:rw
     depends_on:
-    - generate-configs
+    - setup-network
 
   peer-node-1-nemgen:
     build: dockerfiles/nemgen
@@ -68,7 +74,7 @@ services:
     - ../../bin/bash:/bin-mount
     - ../../build/state:/state:rw
     depends_on:
-    - generate-configs
+    - setup-network
 
   api-node-0-nemgen:
     build: dockerfiles/nemgen
@@ -81,4 +87,4 @@ services:
     - ../../bin/bash:/bin-mount
     - ../../build/state:/state:rw
     depends_on:
-    - generate-configs
+    - setup-network