From 534b0fe31d23921feb7eafc15199d01ef73dfa9a Mon Sep 17 00:00:00 2001
From: Thomas E Lackey <telackey@bozemanpass.com>
Date: Tue, 11 Oct 2022 16:01:30 -0500
Subject: [PATCH 1/3] Add docker-compose.yml

---
 Dockerfile                         |  4 +--
 docker-compose.yml                 | 36 ++++++++++++++++++++++++
 docker.env                         | 28 +++++++++++++++++++
 entrypoint.sh                      | 11 +++++---
 ipld-eth-beacon-config-docker.json | 44 ++++++++++++++++++++++++++++++
 ipld-eth-beacon-config.json        | 44 ------------------------------
 6 files changed, 117 insertions(+), 50 deletions(-)
 create mode 100644 docker-compose.yml
 create mode 100644 docker.env
 create mode 100644 ipld-eth-beacon-config-docker.json
 delete mode 100644 ipld-eth-beacon-config.json

diff --git a/Dockerfile b/Dockerfile
index 88005b0..fe321d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,9 +13,9 @@ RUN GCO_ENABLED=0 GOOS=linux go build -race -ldflags="-s -w" -o ipld-eth-beacon-
 RUN chmod +x ipld-eth-beacon-indexer
 
 FROM frolvlad/alpine-bash:latest
-RUN apk --no-cache add ca-certificates libstdc++ busybox-extras
+RUN apk --no-cache add ca-certificates libstdc++ busybox-extras gettext libintl
 WORKDIR /root/
 COPY --from=builder /go/src/github.com/vulcanize/ipld-eth-beacon-indexer/ipld-eth-beacon-indexer /root/ipld-eth-beacon-indexer
 ADD entrypoint.sh .
-ADD ipld-eth-beacon-config.json .
+ADD ipld-eth-beacon-config-docker.json .
 ENTRYPOINT ["./entrypoint.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..c57e85b
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,36 @@
+version: "3.2"
+services:
+  ipld-eth-beacon-db:
+    hostname: ipld-eth-beacon-db
+    env_file:
+      - docker.env
+    restart: always
+    build:
+      dockerfile: ../ipld-eth-beacon-db/Dockerfile
+      context: ../ipld-eth-beacon-db
+    image: cerc/ipld-eth-beacon-db:local
+    healthcheck:
+      test: ["CMD", "nc", "-v", "localhost", "5432"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+    volumes:
+      - vdb_db_eth-beacon_db:/var/lib/postgresql/data
+    ports:
+      - "5432"
+    command: ["postgres", "-c", "log_min_duration_statement=250"]
+
+  ipld-eth-beacon-indexer:
+    hostname: ipld-eth-beacon-indexer
+    env_file:
+      - docker.env
+    restart: always
+    build:
+      dockerfile: ./Dockerfile
+      context: .
+    depends_on:
+      - ipld-eth-beacon-db
+    image: cerc/ipld-eth-beacon-indexer:local
+
+volumes:
+  vdb_db_eth-beacon_db:
diff --git a/docker.env b/docker.env
new file mode 100644
index 0000000..9ec297c
--- /dev/null
+++ b/docker.env
@@ -0,0 +1,28 @@
+POSTGRES_HOST=ipld-eth-beacon-db
+POSTGRES_PASSWORD=CHANGEME
+POSTGRES_PORT=5432
+POSTGRES_USER=ethbeacondb
+POSTGRES_DB=ethbeacondb
+
+LIGHTHOUSE_HOST=host.docker.internal
+LIGHTHOUSE_PORT=5053
+LIGHTHOUSE_PROTOCOL=http
+
+CAPTURE_MODE=head
+LOG_LEVEL=debug
+
+BC_MAX_HISTORIC_PROCESS_WORKER=2
+BC_UNIQUE_NODE_IDENTIFIER=100
+BC_CHECK_DB=true
+BC_BEACON_STATE_PROCESSING_ENABLED=false
+BC_BEACON_BLOCK_PROCESSING_ENABLED=true
+BC_MINIMUM_SLOT=4700013
+
+KG_INCREMENT=10000
+KG_PROCESS_KNOWN_GAPS_ENABLED=true
+KG_MAX_KNOWN_GAPS_WORKER=2
+KG_MINIMUM_SLOT=4700013
+
+PROM_HOST=localhost
+PROM_PORT=9000
+PROM_METRICS_ENABLED=false
diff --git a/entrypoint.sh b/entrypoint.sh
index 5cc37db..006502c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
 sleep 10
-echo "Starting ipld-eth-beacon-indexer"
+sleep "Starting ipld-eth-beacon-indexer"
+
+cat /root/ipld-eth-beacon-config-docker.json | envsubst > /root/ipld-eth-beacon-config.json
 
 echo /root/ipld-eth-beacon-indexer capture ${CAPTURE_MODE} --config /root/ipld-eth-beacon-config.json > /root/ipld-eth-beacon-indexer.output
 
@@ -14,9 +16,10 @@ if [ ${CAPTURE_MODE} == "boot" ]; then
     else
       echo "ipld-eth-beacon-indexer boot succeeded"
     fi
-      echo $rv > /root/HEALTH
-      echo $rv
-      cat /root/ipld-eth-beacon-indexer.output
+
+    echo $rv > /root/HEALTH
+    echo $rv
+    cat /root/ipld-eth-beacon-indexer.output
 
     tail -f /dev/null
 else
diff --git a/ipld-eth-beacon-config-docker.json b/ipld-eth-beacon-config-docker.json
new file mode 100644
index 0000000..2a12897
--- /dev/null
+++ b/ipld-eth-beacon-config-docker.json
@@ -0,0 +1,44 @@
+{
+  "db": {
+    "address": "${POSTGRES_HOST}",
+    "password": "${POSTGRES_PASSWORD}",
+    "port": ${POSTGRES_PORT},
+    "username": "${POSTGRES_USER}",
+    "name": "${POSTGRES_DB}",
+    "driver": "PGX"
+  },
+  "bc": {
+    "address": "${LIGHTHOUSE_HOST}",
+    "port": ${LIGHTHOUSE_PORT},
+    "type": "lighthouse",
+    "bootRetryInterval": 30,
+    "bootMaxRetry": 5,
+    "maxHistoricProcessWorker": ${BC_MAX_HISTORIC_PROCESS_WORKER},
+    "connectionProtocol": "${LIGHTHOUSE_PROTOCOL}",
+    "uniqueNodeIdentifier": ${BC_UNIQUE_NODE_IDENTIFIER},
+    "checkDb": ${BC_CHECK_DB},
+    "performBeaconStateProcessing": ${BC_BEACON_STATE_PROCESSING_ENABLED},
+    "performBeaconBlockProcessing": ${BC_BEACON_BLOCK_PROCESSING_ENABLED},
+    "minimumSlot": ${BC_MINIMUM_SLOT}
+  },
+  "t": {
+    "skipSync": true
+  },
+  "log": {
+    "level": "${LOG_LEVEL}",
+    "output": true,
+    "file": "./ipld-eth-beacon-indexer.log",
+    "format": "json"
+  },
+  "kg": {
+    "increment": ${KG_INCREMENT},
+    "processKnownGaps": ${KG_PROCESS_KNOWN_GAPS_ENABLED},
+    "maxKnownGapsWorker": ${KG_MAX_KNOWN_GAPS_WORKER},
+    "minimumSlot": ${KG_MINIMUM_SLOT}
+  },
+  "pm": {
+    "address": "${PROM_HOST}",
+    "port": ${PROM_PORT},
+    "metrics": ${PROM_METRICS_ENABLED}
+  }
+}
diff --git a/ipld-eth-beacon-config.json b/ipld-eth-beacon-config.json
deleted file mode 100644
index 7a22376..0000000
--- a/ipld-eth-beacon-config.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "db": {
-    "address": "localhost",
-    "password": "password",
-    "port": 5432,
-    "username": "vdbm",
-    "name": "vulcanize_db",
-    "driver": "PGX"
-  },
-  "bc": {
-    "address": "localhost",
-    "port": 5052,
-    "type": "lighthouse",
-    "bootRetryInterval": 30,
-    "bootMaxRetry": 5,
-    "maxHistoricProcessWorker": 2,
-    "connectionProtocol": "http",
-    "uniqueNodeIdentifier": 100,
-    "checkDb": true,
-    "performBeaconStateProcessing": false,
-    "performBeaconBlockProcessing": true,
-    "minimumSlot": 4700013
-  },
-  "t": {
-    "skipSync": true
-  },
-  "log": {
-    "level": "debug",
-    "output": true,
-    "file": "./ipld-eth-beacon-indexer.log",
-    "format": "json"
-  },
-  "kg": {
-    "increment": 10000,
-    "processKnownGaps": true,
-    "maxKnownGapsWorker": 2,
-    "minimumSlot": 4700013
-  },
-  "pm": {
-    "address": "localhost",
-    "port": 9000,
-    "metrics": true
-  }
-}
-- 
2.45.2


From 4b3ec1b5a09d6af3a34d71141fef94b337c684ac Mon Sep 17 00:00:00 2001
From: Thomas E Lackey <telackey@bozemanpass.com>
Date: Tue, 11 Oct 2022 16:06:01 -0500
Subject: [PATCH 2/3] Typo

---
 entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 006502c..e808500 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 sleep 10
-sleep "Starting ipld-eth-beacon-indexer"
+echo "Starting ipld-eth-beacon-indexer"
 
 cat /root/ipld-eth-beacon-config-docker.json | envsubst > /root/ipld-eth-beacon-config.json
 
-- 
2.45.2


From a6301feb307f4dd8a62df7804fb22d78950012c0 Mon Sep 17 00:00:00 2001
From: Thomas E Lackey <telackey@bozemanpass.com>
Date: Tue, 11 Oct 2022 16:10:39 -0500
Subject: [PATCH 3/3] Tweak defaults

---
 docker.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker.env b/docker.env
index 9ec297c..c2763b0 100644
--- a/docker.env
+++ b/docker.env
@@ -5,7 +5,7 @@ POSTGRES_USER=ethbeacondb
 POSTGRES_DB=ethbeacondb
 
 LIGHTHOUSE_HOST=host.docker.internal
-LIGHTHOUSE_PORT=5053
+LIGHTHOUSE_PORT=5052
 LIGHTHOUSE_PROTOCOL=http
 
 CAPTURE_MODE=head
@@ -23,6 +23,6 @@ KG_PROCESS_KNOWN_GAPS_ENABLED=true
 KG_MAX_KNOWN_GAPS_WORKER=2
 KG_MINIMUM_SLOT=4700013
 
-PROM_HOST=localhost
+PROM_HOST=host.docker.internal
 PROM_PORT=9000
 PROM_METRICS_ENABLED=false
-- 
2.45.2