From fef4c2b8279af9aa9216a0e45e2bf4c8791eb04e Mon Sep 17 00:00:00 2001
From: Tony Ke <tonyke@fuzz.land>
Date: Fri, 26 Jan 2024 11:00:13 +0800
Subject: [PATCH] update docker stuff

---
 .gitignore           |  6 ++++--
 Dockerfile           |  3 +--
 docker-compose.yml   | 30 +++++++++++++++++++++---------
 docker-entrypoint.sh | 16 ----------------
 4 files changed, 26 insertions(+), 29 deletions(-)
 delete mode 100755 docker-entrypoint.sh

diff --git a/.gitignore b/.gitignore
index 3ec22b9..e8adb65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,7 @@
 /target
 
 /run.sh
-data
-redis-dataflamegraph.svg
+/redis-data
+
+/*flamegraph.svg
+
diff --git a/Dockerfile b/Dockerfile
index b6313f6..54d03eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,9 +26,8 @@ RUN apt update  \
 RUN update-ca-certificates
 
 COPY --from=builder /app/target/release/cached-eth-rpc /app/cached-eth-rpc
-COPY ./docker-entrypoint.sh /app/docker-entrypoint.sh
 
 ENV ENDPOINTS="eth-chain=https://rpc.ankr.com/eth,bsc-chain=https://rpc.ankr.com/bsc"
 
 EXPOSE 8124
-CMD ["/app/docker-entrypoint.sh", "/app/cached-eth-rpc"]
+ENTRYPOINT [ "/app/cached-eth-rpc" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index 675946b..83f5bd2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,27 @@
 version: "3"
 services:
-  docker-redis:
-    image: redis:alpine
-    ports:
-      - "6379:6379"
-    volumes:
-      - ./redis-data:/data
   rpc:
     image: ghcr.io/fuzzland/cached-eth-rpc:latest
     ports:
       - "8124:8124"
-    environment:
-      - ENDPOINTS=eth-chain=https://rpc.ankr.com/eth,bsc-chain=https://rpc.ankr.com/bsc
-      - REDIS_URL=redis://docker-redis:6379
+    command:
+      - --port=8124
+      - --bind=0.0.0.0
+      - --endpoint=eth=https://rpc.ankr.com/eth
+      - --endpoint=bsc=https://rpc.ankr.com/bsc
+      - --redis-url=redis://docker-redis:6379
+
+  redis:
+    image: redis:alpine
+    ports:
+      - "6379:6379"
+    volumes:
+      - redis-data:/data
+
+volumes:
+  redis-data:
+    driver: local
+    driver_opts:
+      type: none
+      device: ./redis-data
+      o: bind
\ No newline at end of file
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
deleted file mode 100755
index 69854d6..0000000
--- a/docker-entrypoint.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-IFS=',' read -ra PARTS <<< "$ENDPOINTS"
-ARGUMENTS=""
-
-for part in "${PARTS[@]}"; do
-  ARGUMENTS+="--endpoint $part "
-done
-
-if [ -n "$REDIS_URL" ]; then
-  ARGUMENTS+="--redis-url $REDIS_URL"
-  # wait for redis to be ready
-  sleep 1
-fi
-
-exec $1 --port 8124 --bind 0.0.0.0 $ARGUMENTS