fix: overhauled Docker deployment

Author: PascalinDe

Dockerfiles/Dockerfile.dela

@@ -9,7 +9,5 @@ WORKDIR /go/d-voting/cli/memcoin
 RUN go build
 ENV PATH=/go/dela/cli/crypto:/go/d-voting/cli/memcoin:${PATH}
 WORKDIR /go
-RUN mkdir /data
-RUN crypto bls signer new --save /data/private.key
-ENTRYPOINT ["/bin/bash", "-c", "memcoin --config /tmp/node start --postinstall --proxyaddr :$PROXYPORT --proxykey $PROXYKEY --listen tcp://$HOSTNAME:2000 --routing tree"]
+ENTRYPOINT ["/bin/bash", "-c", "memcoin --config /data/node start --postinstall --proxyaddr :$PROXYPORT --proxykey $PROXYKEY --listen tcp://0.0.0.0:2000 --public http://$HOSTNAME:2000 --routing tree"]
 CMD []

README.docker.md

@@ -11,10 +11,7 @@ The relevant files are:
 You need to create a local .env file with the following content:
 
 ```
-DELA_REPLICAS=3                                 # number of Dela nodes to deploy
-DELA_NODE_URL=http://d-voting-dela-1:8080       # Dela node URL *within the Docker network* (port must be in DELA_PROXY_PORT_RANGE)
-DELA_PORT_RANGE=2000-2002                       # Dela ports (at least DELA_REPLICAS ports)
-DELA_PROXY_PORT_RANGE=8080-8082                 # Dela proxy ports (at least DELA_REPLICAS ports)
+DELA_NODE_URL=http://dela-leader:8080           # Dela node URL *within the Docker network* (port must be in DELA_PROXY_PORT_RANGE)
 DATABASE_USERNAME=dvoting                       # choose any PostgreSQL username
 DATABASE_PASSWORD=                              # choose any PostgreSQL password
 DATABASE_HOST=db                                # PostgreSQL host *within the Docker network*
@@ -52,6 +49,8 @@ to delete the volumes (this will reset your instance).
 
 ## Post-install commands
 
-1. run the script `DELA_REPLICAS=... init_dela.sh` to initialize the DELA network with `DELA_REPLICAS set to the same value as in .env`
-2. run `docker exec -it d-voting-backend-1 /bin/bash` to connect to the backend
-3. execute `node -e 'require("./dbUtils").addAdmin("./dvoting-users", <sciper>)'` with your Sciper to add yourself as admin
+1. `./init_dela.sh`
+2. `docker compose exec backend /bin/bash`
+3. `cd src`
+4. `node -e 'require("./dbUtils").addAdmin("<sciper>")'`
+5. exit the container and run `docker compose down && docker compose up -d`

docker-compose.yml

@@ -1,16 +1,38 @@
 services:
 
-  dela:             # DELA nodes
+  dela-leader:             # inital DELA leader node
     image: dela
     build:
-      dockerfile: ./Dockerfile.dela
-      context: ./Dockerfiles
-    deploy:
-      replicas: ${DELA_REPLICAS}
+      dockerfile: ./Dockerfiles/Dockerfile.dela
     environment:
       PROXYKEY: ${PUBLIC_KEY}
       PROXYPORT: ${PROXYPORT}
-      LLVL: info
+      LLVL: debug
+    volumes:
+      - dela-leader:/data
+    hostname: dela-leader
+  dela-worker-1:             # DELA worker node
+    image: dela
+    build:
+      dockerfile: ./Dockerfiles/Dockerfile.dela
+    environment:
+      PROXYKEY: ${PUBLIC_KEY}
+      PROXYPORT: ${PROXYPORT}
+      LLVL: debug
+    volumes:
+      - dela-worker-1:/data
+    hostname: dela-worker-1
+  dela-worker-2:             # DELA worker node
+    image: dela
+    build:
+      dockerfile: ./Dockerfiles/Dockerfile.dela
+    environment:
+      PROXYKEY: ${PUBLIC_KEY}
+      PROXYPORT: ${PROXYPORT}
+      LLVL: debug
+    volumes:
+      - dela-worker-2:/data
+    hostname: dela-worker-2
 
   frontend:         # web service frontend
     image: frontend
@@ -53,3 +75,6 @@ services:
 
 volumes:
   postgres-data:    # PostgreSQL database
+  dela-leader:
+  dela-worker-1:
+  dela-worker-2:

init_dela.sh

@@ -1,35 +1,33 @@
 #!/bin/bash
 
-# check if DELA_REPLICAS environment variable is set
-if [ -z ${DELA_REPLICAS} ]; then
-  echo "DELA_REPLICAS environment variable needs to be set to use this script";
-  exit 1;
-fi
-
-LEADER_IP=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' d-voting-dela-1);
 MEMBERS="";
 
+# create signing keys
+for container in dela-leader dela-worker-1 dela-worker-2; do
+  docker compose exec "$container" crypto bls signer new --save /data/private.key;
+done
+
 # share the certificate
-for i in $(seq 2 "$DELA_REPLICAS"); do
-  TOKEN_ARGS=$(docker exec d-voting-dela-1 /bin/bash -c 'LLVL=error memcoin --config /tmp/node minogrpc token');
-  docker exec d-voting-dela-"$i" memcoin --config /tmp/node minogrpc join --address //"$LEADER_IP":2000 $TOKEN_ARGS;
+for container in dela-worker-1 dela-worker-2; do
+  TOKEN_ARGS=$(docker compose exec dela-leader /bin/bash -c 'LLVL=error memcoin --config /data/node minogrpc token');
+  docker compose exec "$container" memcoin --config /data/node minogrpc join --address //dela-leader:2000 $TOKEN_ARGS;
 done
 
 # create a new chain with the nodes
-for i in $(seq 1 "$DELA_REPLICAS"); do
+for container in dela-leader dela-worker-1 dela-worker-2; do
   # add node to the chain
-  MEMBERS="$MEMBERS --member $(docker exec d-voting-dela-$i /bin/bash -c 'LLVL=error memcoin --config /tmp/node ordering export')";
+  MEMBERS="$MEMBERS --member $(docker compose exec $container /bin/bash -c 'LLVL=error memcoin --config /data/node ordering export')";
 done
-docker exec d-voting-dela-1 memcoin --config /tmp/node ordering setup $MEMBERS;
+docker compose exec dela-leader memcoin --config /data/node ordering setup $MEMBERS;
 
 # authorize the signer to handle the access contract on each node
-for i in $(seq 1 "$DELA_REPLICAS"); do
-  docker exec d-voting-dela-"$i" /bin/bash -c 'memcoin --config /tmp/node access add --identity $(crypto bls signer read --path /data/private.key --format BASE64_PUBKEY)';
+for container in dela-leader dela-worker-1 dela-worker-2; do
+  docker compose exec "$container" /bin/bash -c 'memcoin --config /data/node access add --identity $(crypto bls signer read --path /data/private.key --format BASE64_PUBKEY)';
 done
 
-IDENTITY=$(docker exec d-voting-dela-1 crypto bls signer read --path /data/private.key --format BASE64_PUBKEY);
+IDENTITY=$(docker compose exec dela-leader crypto bls signer read --path /data/private.key --format BASE64_PUBKEY);
 # update the access contract
-docker exec d-voting-dela-1 memcoin --config /tmp/node pool add\
+docker compose exec dela-leader memcoin --config /data/node pool add\
     --key /data/private.key\
     --args go.dedis.ch/dela.ContractArg\
     --args go.dedis.ch/dela.Access\