feat: Docker using --noTLS

c4dt · Oct 3, 2023 · 125797a · 125797a
1 parent 636d9aa
commit 125797a
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 35 deletions.
diff --git a/Dockerfiles/Dockerfile.dela b/Dockerfiles/Dockerfile.dela
@@ -13,7 +13,7 @@ COPY --from=base /go/d-voting .
 WORKDIR /go/d-voting/cli/dvoting
 RUN go build
 ENV PATH=/go/dela/cli/crypto:/go/d-voting/cli/dvoting:${PATH}
-ENTRYPOINT ["/bin/bash", "-c", "dvoting --config /data/node start --postinstall --proxyaddr :$PROXYPORT --proxykey $PROXYKEY --listen tcp://0.0.0.0:2000 --public http://$HOSTNAME:$NODEPORT --routing tree"]
+ENTRYPOINT ["/bin/bash", "-c", "dvoting --config /data/node start --postinstall --proxyaddr :$PROXYPORT --proxykey $PROXYKEY --listen tcp://0.0.0.0:2000 --public https://$PUBLIC_HOSTNAME:$NODEPORT --routing tree --noTLS"]
 CMD []
 
 FROM base AS debug

diff --git a/docker-compose/docker-compose.debug.yml b/docker-compose/docker-compose.debug.yml
@@ -1,58 +1,62 @@
 version: "3.8"
-x-dela: &dela
+x-dela-img: &dela-img
   image: ghcr.io/c4dt/d-voting-dela:latest
-  environment:
-    PROXYKEY: ${PUBLIC_KEY}
-    PROXYPORT: ${PROXYPORT}
-    PROXY_LOG: info
-    LLVL: debug
-    NODEPORT: ${NODEPORT}
-  security_opt:
-    - apparmor:unconfined
-  cap_add:
-    - SYS_PTRACE
+x-dela-env: &dela-env
+  PROXYKEY: ${PUBLIC_KEY}
+  PROXYPORT: ${PROXYPORT}
+  PROXY_LOG: info
+  LLVL: debug
+  NODEPORT: ${NODEPORT}
 
 services:
 
   dela-worker-0:             # inital DELA leader node
-    <<: *dela
+    <<: *dela-img
+    environment:
+      <<: *dela-env
+      PUBLIC_HOSTNAME: dela-worker-0
     build:
       dockerfile: Dockerfiles/Dockerfile.dela
       context: ../
       target: debug
     volumes:
       - dela-worker-0-data:/data
-    hostname: dela-worker-0
     ports:
       - 127.0.0.1:40000:40000
     networks:
       d-voting:
         ipv4_address: 172.19.44.254
   dela-worker-1:             # DELA worker node
-    <<: *dela
+    <<: *dela-img
+    environment:
+      <<: *dela-env
+      PUBLIC_HOSTNAME: dela-worker-1
     volumes:
       - dela-worker-1-data:/data
-    hostname: dela-worker-1
     ports:
       - 127.0.0.1:40001:40000
     networks:
       d-voting:
         ipv4_address: 172.19.44.253
   dela-worker-2:             # DELA worker node
-    <<: *dela
+    <<: *dela-img
+    environment:
+      <<: *dela-env
+      PUBLIC_HOSTNAME: dela-worker-2
     volumes:
       - dela-worker-2-data:/data
-    hostname: dela-worker-2
     ports:
       - 127.0.0.1:40002:40000
     networks:
       d-voting:
         ipv4_address: 172.19.44.252
   dela-worker-3:             # DELA worker node
-    <<: *dela
+    <<: *dela-img
+    environment:
+      <<: *dela-env
+      PUBLIC_HOSTNAME: dela-worker-3
     volumes:
       - dela-worker-3-data:/data
-    hostname: dela-worker-3
     ports:
       - 127.0.0.1:40003:40000
     networks:

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -1,48 +1,56 @@
 version: "3.8"
-x-dela: &dela
+x-dela-img: &dela-img
   image: ghcr.io/c4dt/d-voting-dela:latest
-  environment:
-    PROXYKEY: ${PUBLIC_KEY}
-    PROXYPORT: ${PROXYPORT}
-    PROXY_LOG: info
-    LLVL: info
-    NODEPORT: ${NODEPORT}
+x-dela-env: &dela-env
+  PROXYKEY: ${PUBLIC_KEY}
+  PROXYPORT: ${PROXYPORT}
+  PROXY_LOG: info
+  LLVL: info
+  NODEPORT: ${NODEPORT}
 
 services:
 
   dela-worker-0:             # inital DELA leader node
-    <<: *dela
+    <<: *dela-img
+    environment:
+      <<: *dela-env
+      PUBLIC_HOSTNAME: dela-worker-0
     build:
       dockerfile: Dockerfiles/Dockerfile.dela
       context: ../
       target: production
     volumes:
       - dela-worker-0-data:/data
-    hostname: dela-worker-0
     networks:
       d-voting:
         ipv4_address: 172.19.44.254
   dela-worker-1:             # DELA worker node
-    <<: *dela
+    <<: *dela-img
+    environment:
+      <<: *dela-env
+      PUBLIC_HOSTNAME: dela-worker-1
     volumes:
       - dela-worker-1-data:/data
-    hostname: dela-worker-1
     networks:
       d-voting:
         ipv4_address: 172.19.44.253
   dela-worker-2:             # DELA worker node
-    <<: *dela
+    <<: *dela-img
+    environment:
+      <<: *dela-env
+      PUBLIC_HOSTNAME: dela-worker-2
     volumes:
       - dela-worker-2-data:/data
-    hostname: dela-worker-2
     networks:
       d-voting:
         ipv4_address: 172.19.44.252
   dela-worker-3:             # DELA worker node
-    <<: *dela
+    <<: *dela-img
+    environment:
+      <<: *dela-env
+      PUBLIC_HOSTNAME: dela-worker-3
     volumes:
       - dela-worker-3-data:/data
-    hostname: dela-worker-3
     networks:
       d-voting:
         ipv4_address: 172.19.44.251