From 80a1d3c15736d2b04c345592ab54906e6f4fd2fd Mon Sep 17 00:00:00 2001
From: Slava <20563034+veaceslavdoina@users.noreply.github.com>
Date: Fri, 29 Mar 2024 09:22:03 +0200
Subject: [PATCH] Update docker compose and guide (#4)

---
 README.md           | 44 +++++++++++++++++++++++++++++---
 docker-compose.yaml | 61 +++++++++++++++++++++++++++++----------------
 2 files changed, 80 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index 4351e39..208622f 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,52 @@
 # Codex Testnet Starter
 Hit the ground running with Codex.
 
-## How to start
+1. [How to start](#how-to-start)
+2. [How to stop](#how-to-stop)
+3. [How to stop and delete everything](#how-to-stop-and-delete-everything)
+4. [Troubleshooting](#troubleshooting)
+
+
+## [How to start](#codex-testnet-starter)
 - Have docker installed.
 - Clone this repo.
+- Define variables
+  ```shell
+  export PRIV_KEY=9721fb80cf32275ce80ae41927130adc767d435dbb1d80114dac2ef2d7c951f0
+
+  # export CODEX_ETH_PROVIDER=https://rpc.testnet.codex.storage
+  # export GETH_VERBOSITY=4
+  ```
 - `docker-compose up -d`
 - Open browser to `<GUI ENDPOINT HERE>`
 
-## How to stop
+
+
+
+## [How to stop](#codex-testnet-starter)
 - `docker-compose down`
 
-## How to stop and delete everything
+## [How to stop and delete everything](#codex-testnet-starter)
 - `docker-compose down --rmi all -v`
+
+
+## [Troubleshooting](#codex-testnet-starter)
+
+
+### Geth
+```shell
+# List peers
+docker exec -it geth geth attach --exec net.peerCount /data/geth.ipc
+
+# Connected peers
+docker exec -it geth geth attach --exec admin.peers /data/geth.ipc
+
+# Add a peer
+docker exec -it geth geth attach --exec 'admin.addPeer("enode://cff0c44c62ecd6e00d72131f336bb4e4968f2c1c1abeca7d4be2d35f818608b6d8688b6b65a18f1d57796eaca32fd9d08f15908a88afe18c1748997235ea6fe7@159.223.243.50:40010")' /data/geth.ipc
+
+# Sync status
+docker exec -it geth geth attach --exec eth.syncing /data/geth.ipc
+
+# Geth own enode
+docker exec -it geth geth attach --exec admin.nodeInfo.enode /data/geth.ipc
+```
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 040d5d2..834552d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,7 +3,7 @@ services:
   # Codex Node
   codex:
     image: codexstorage/nim-codex:sha-61ea685-dist-tests
-    pull_policy: always
+    container_name: codex
     command:
       - codex
       - persistence
@@ -19,49 +19,53 @@ services:
       - CODEX_API_BINDADDR=0.0.0.0
       - CODEX_LISTEN_ADDRS=/ip4/0.0.0.0/tcp/8070
       - CODEX_DISC_PORT=8090
-      - NAT_PUBLIC_IP_AUTO=https://ip.codex.storage
-      - NAT_IP_AUTO=false
-      - CODEX_ETH_PROVIDER=ws://geth:8546
+      - NAT_PUBLIC_IP_AUTO=${NAT_PUBLIC_IP_AUTO:-https://ip.codex.storage}
+      - CODEX_ETH_PROVIDER=${CODEX_ETH_PROVIDER:-ws://geth:8546}
       - CODEX_VALIDATOR=false
-      - PRIV_KEY=<YOUR-KEY-HERE>
+      - PRIV_KEY=${PRIV_KEY}
       - CODEX_MARKETPLACE_ADDRESS=0x6411d9c4f8d16Fe6Dc632660a2d196BEE0Aa4546
     ports:
-      - 8080:8080/tcp # API port
-      - 8090:8090/udp # Discovery port
-      - 8070:8070/tcp # Listen port
+      - 8080:8080/tcp # API
+      - 8090:8090/udp # Discovery
+      - 8070:8070/tcp # Transport
     volumes:
       - ./codex-data:/datadir
+    logging:
+      driver: json-file
+      options:
+        max-size: 100m
+        max-file: 5
+    networks:
+      - codex
     depends_on:
       geth:
         condition: service_healthy
 
   # Geth init
   geth-init:
-    image: ethereum/client-go:v1.13.5
+    image: ethereum/client-go:v1.13.14
+    container_name: geth-init
     entrypoint: /bin/sh
     command: -c '[ -d /data/geth/chaindata ] && echo "Genesis block already created" || geth init --datadir /data /data/genesis.json'
     volumes:
       - ./geth-data:/data
       - ./genesis.json:/data/genesis.json
-    healthcheck:
-      test: ["CMD", "sleep", "5"]
-      interval: 5s
-      timeout: 30s
-      retries: 1
+    networks:
+      - codex
 
   # Geth
   geth:
-    image: ethereum/client-go:v1.13.5
+    image: ethereum/client-go:v1.13.14
+    container_name: geth
     environment:
       - GETH_DATADIR=/data
       - GETH_NETWORKID=789987
-      - GETH_SYNCMODE=full
-
+      - GETH_SYNCMODE=snap
+      # - GETH_NAT=extip:1.1.1.1
       - GETH_NAT=auto
       - GETH_DISCOVERY_PORT=8547
       - GETH_PORT=8548
-
-      - GETH_VERBOSITY=3
+      - GETH_VERBOSITY=${GETH_VERBOSITY:-3}
       - GETH_HTTP=true
       - GETH_HTTP_PORT=8545
       - GETH_HTTP_ADDR=0.0.0.0
@@ -73,13 +77,26 @@ services:
       - 8545:8545/tcp # HTTP-RPC
       - 8546:8546/tcp # WS-RPC
       - 8547:8547/udp # Discovery
-      - 8548:8548/tcp # Listen
+      - 8548:8548/tcp # Transport
     volumes:
       - ./geth-data:/data
+    logging:
+      driver: json-file
+      options:
+        max-size: 100m
+        max-file: 5
     depends_on:
       - geth-init
+    networks:
+      - codex
     healthcheck:
       test: ["CMD", "sleep", "15"]
-      interval: 15s
+      interval: 10s
       timeout: 60s
-      retries: 1
+      retries: 100
+      start_period: 5m
+
+networks:
+  codex:
+    name: codex
+    driver: bridge