Docker-compose: update with new images

Author: dannywillems

docker-compose.archive.devnet.yml

@@ -61,7 +61,7 @@ services:
       - "127.0.0.1:3086:3086"
 
   mina-rust-node:
-    image: openmina/openmina:latest
+    image: o1labs/mina-rust:${MINA_RUST_TAG:-latest}
     container_name: mina-rust-node
     environment:
       - MINA_ARCHIVE_ADDRESS=http://archive-mina-rust:3086

docker-compose.block-producer.yml

@@ -1,8 +1,15 @@
 services:
   mina-node:
-    image: openmina/openmina:${MINA_TAG:-latest}
-    entrypoint: >
-      sh -c "mina node --producer-key /root/.mina/producer-key $${COINBASE_RECEIVER:+--coinbase-receiver $$COINBASE_RECEIVER} $${MINA_LIBP2P_EXTERNAL_IP:+--libp2p-external-ip $$MINA_LIBP2P_EXTERNAL_IP} $${MINA_LIBP2P_PORT:+--libp2p-port $$MINA_LIBP2P_PORT}"
+    image: o1labs/mina-rust:${MINA_RUST_TAG:-latest}
+    entrypoint: ["/bin/sh", "-c"]
+    command: >
+      "
+      ARGS='node --producer-key /root/.mina/producer-key';
+      if [ -n \"$$COINBASE_RECEIVER\" ]; then ARGS=\"$$ARGS --coinbase-receiver $$COINBASE_RECEIVER\"; fi;
+      if [ -n \"$$MINA_LIBP2P_EXTERNAL_IP\" ]; then ARGS=\"$$ARGS --libp2p-external-ip $$MINA_LIBP2P_EXTERNAL_IP\"; fi;
+      if [ -n \"$$MINA_LIBP2P_PORT\" ]; then ARGS=\"$$ARGS --libp2p-port $$MINA_LIBP2P_PORT\"; fi;
+      exec mina $$ARGS
+      "
     ports:
       - "3000:3000"
       - "${MINA_LIBP2P_PORT:-8302}:${MINA_LIBP2P_PORT:-8302}"
@@ -11,12 +18,12 @@ services:
     environment:
       MINA_PRIVKEY_PASS: "${MINA_PRIVKEY_PASS:-}"
       COINBASE_RECEIVER: "${COINBASE_RECEIVER:-}"
-      MINA_LIBP2P_EXTERNAL_IP: "${MINA_LIBP2P_EXTERNAL_IP}"
-      MINA_LIBP2P_PORT: "${MINA_LIBP2P_PORT}"
+      MINA_LIBP2P_EXTERNAL_IP: "${MINA_LIBP2P_EXTERNAL_IP:-}"
+      MINA_LIBP2P_PORT: "${MINA_LIBP2P_PORT:-8302}"
 
   frontend:
-    image: openmina/frontend:${MINA_FRONTEND_TAG:-latest}
+    image: o1labs/mina-rust-frontend:${MINA_FRONTEND_TAG:-latest}
     environment:
       MINA_FRONTEND_ENVIRONMENT: compose-producer
     ports:
-      - "8070:80"
+      - "8070:8070"

docker-compose.local.producers.yml

@@ -1,7 +1,7 @@
 services:
   local-producer-cluster:
     container_name: local-producer-cluster
-    image: openmina/openmina:0.16.0
+    image: o1labs/mina-rust:${MINA_RUST_TAG:-latest}
     environment:
       - RUST_BACKTRACE=1
     entrypoint: ["openmina-node-testing", "scenarios-generate", "--name", "simulation-small-forever-real-time"]
@@ -12,8 +12,8 @@ services:
 
   frontend:
     container_name: frontend
-    image: openmina/frontend:0.16.0
+    image: o1labs/mina-rust-frontend:${MINA_FRONTEND_TAG:-latest}
     environment:
       MINA_FRONTEND_ENVIRONMENT: block-producers
     ports:
-      - "8070:80"
+      - "8070:8070"

docker-compose.yml

@@ -1,17 +1,21 @@
 services:
   mina-node:
-    image: o1labs/mina-rust:${MINA_TAG:-latest}
+    image: o1labs/mina-rust:${MINA_RUST_TAG:-latest}
+    entrypoint: ["/bin/sh", "-c"]
     command: >
-      node --network devnet
-      $${MINA_LIBP2P_EXTERNAL_IP:+--libp2p-external-ip $$MINA_LIBP2P_EXTERNAL_IP}
-      $${MINA_LIBP2P_PORT:+--libp2p-port $$MINA_LIBP2P_PORT}
+      "
+      ARGS='node --network devnet';
+      if [ -n \"$$MINA_LIBP2P_EXTERNAL_IP\" ]; then ARGS=\"$$ARGS --libp2p-external-ip $$MINA_LIBP2P_EXTERNAL_IP\"; fi;
+      if [ -n \"$$MINA_LIBP2P_PORT\" ]; then ARGS=\"$$ARGS --libp2p-port $$MINA_LIBP2P_PORT\"; fi;
+      exec mina $$ARGS
+      "
     volumes:
       - ./mina-workdir:/root/.mina:rw
     ports:
       - "${MINA_LIBP2P_PORT:-8302}:${MINA_LIBP2P_PORT:-8302}"
     environment:
-      MINA_LIBP2P_EXTERNAL_IP: "${MINA_LIBP2P_EXTERNAL_IP}"
-      MINA_LIBP2P_PORT: "${MINA_LIBP2P_PORT}"
+      MINA_LIBP2P_EXTERNAL_IP: "${MINA_LIBP2P_EXTERNAL_IP:-}"
+      MINA_LIBP2P_PORT: "${MINA_LIBP2P_PORT:-8302}"
 
   frontend:
     image: o1labs/mina-rust-frontend:${MINA_FRONTEND_TAG:-latest}