Launch the collator node

The biggest change here is adding the testing_net network to the
collator node's networks list. This lets it successfully connect
to the alice and bob nodes, which in turn lets it get their node IDs,
which was the blocker for a long time.

Remove httpie in favor of curl: makes for a smaller docker image,
and has fewer weird failure modes within docker.

Unfortunately this doesn't yet actually connect to the relay chain
nodes; that's the next area to figure out.

docker/docker-compose.yml

@@ -25,6 +25,8 @@ services:
     networks:
       testing_net:
         ipv4_address: 172.28.1.1
+        aliases:
+          - alice
 
   node_bob:
     image: "polkadot:${BRANCH:-bkchr-cumulus-branch}"
@@ -38,8 +40,6 @@ services:
         source: ./test/parachain/res/polkadot_chainspec.json
         target: /chainspec.json
         read_only: true
-    links:
-      - "node_alice:alice"
     command: >
       polkadot
       --chain=/chainspec.json
@@ -53,6 +53,8 @@ services:
     networks:
       testing_net:
         ipv4_address: 172.28.1.2
+        aliases:
+          - bob
 
   genesis_state:
     build:
@@ -77,7 +79,8 @@ services:
     command: >
       inject_bootnodes.sh
       --base-path=/data
-
+    networks:
+      testing_net:
 
 
 volumes:

docker/test-parachain-collator.dockerfile

@@ -20,7 +20,7 @@ RUN time cargo build --release -p cumulus-test-parachain-collator
 #
 # with the appropriate ID for both Alice and Bob
 FROM debian:buster-slim as collator
-RUN apt-get update && apt-get install httpie jq curl bash -y && \
+RUN apt-get update && apt-get install jq curl bash -y && \
     curl -sSo /wait-for-it.sh https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh && \
     chmod +x /wait-for-it.sh
 COPY --from=builder \

inject_bootnodes.sh

@@ -8,22 +8,27 @@
 
 set -e -o pipefail
 
-if [ ! -x cumulus-test-parachain-collator ]; then
-    echo "FATAL: cumulus-test-parachain collator not in PATH"
+ctpc="/usr/bin/cumulus-test-parachain-collator"
+
+if [ ! -x "$ctpc" ]; then
+    echo "FATAL: $ctpc does not exist or is not executable"
     exit 1
 fi
 
 # name the variable with the incoming args so it isn't overwritten later by function calls
-args=( "${@[@]}" )
+args=( "$@" )
 
 alice="172.28.1.1:9933"
 bob="172.28.1.2:9935"
 
 get_id () {
     node="$1"
     /wait-for-it.sh "$node" -t 10 -s -- \
-        http http://"$node" id:=1 jsonrpc="2.0" method=system_networkState |\
-        jq -r '.result.peerId'
+        curl -sS \
+            -H 'Content-Type: application/json' \
+            --data '{"id":1,"jsonrpc":"2.0","method":"system_networkState"}' \
+            "$node" |\
+    jq -r '.result.peerId'
 }
 
 bootnode () {
@@ -36,4 +41,5 @@ bootnode () {
 
 args+=( "--bootnodes" "$(bootnode "$alice")" "--bootnodes" "$(bootnode "$bob")" )
 
-cumulus-test-parachain-collator "${args[@]}"
+set -x
+"$ctpc" "${args[@]}"