Restructure client files into separate directories

Author: danyalprout

.env

@@ -1,2 +1,2 @@
-GETH_HOST_DATA_DIR=./geth-data
-RETH_HOST_DATA_DIR=./reth-data
+HOST_DATA_DIR=./geth-data
+CLIENT=geth

.github/workflows/docker.yml

@@ -42,7 +42,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.geth
+          file: geth/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -81,7 +81,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.reth
+          file: reth/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/pr.yml

@@ -20,7 +20,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.geth
+          file: geth/Dockerfile
           push: false
           platforms: ${{ matrix.arch }}
   reth:
@@ -43,7 +43,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile.reth
+          file: reth/Dockerfile
           push: false
           build-args: |
             FEATURES=${{ matrix.features }}

docker-compose-reth.yml

@@ -2,22 +2,22 @@ services:
   execution:
     build:
       context: .
-      dockerfile: Dockerfile.geth
+      dockerfile: ${CLIENT}/Dockerfile
     ports:
       - "8545:8545"       # RPC
       - "8546:8546"       # websocket
       - "7301:6060"       # metrics
     command: [ "bash", "./execution-entrypoint" ]
     volumes:
-        - ${GETH_HOST_DATA_DIR}:/data
+        - ${HOST_DATA_DIR}:/data
     env_file:
       # select your network here:
 #      - .env.sepolia
 #      - .env.mainnet
   node:
     build:
       context: .
-      dockerfile: Dockerfile.geth
+      dockerfile: ${CLIENT}/Dockerfile
     depends_on:
       - execution
     ports:

docker-compose.yml

@@ -42,7 +42,7 @@ WORKDIR /app
 COPY --from=op /app/op-node/bin/op-node ./
 COPY --from=geth /app/build/bin/geth ./
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY geth-entrypoint ./execution-entrypoint
+COPY geth/geth-entrypoint ./execution-entrypoint
 COPY op-node-entrypoint .
 
 CMD ["/usr/bin/supervisord"]

Dockerfile.geth geth/Dockerfile

@@ -40,7 +40,7 @@ WORKDIR /app
 COPY --from=op /app/op-node/bin/op-node ./
 COPY --from=reth /app/target/maxperf/op-reth ./
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY reth-entrypoint ./execution-entrypoint
+COPY ./reth/reth-entrypoint ./execution-entrypoint
 COPY op-node-entrypoint .
 
 CMD ["/usr/bin/supervisord"]

geth-entrypoint geth/geth-entrypoint

@@ -17,7 +17,6 @@ echo "$OP_NODE_L2_ENGINE_AUTH_RAW" > "$OP_NODE_L2_ENGINE_AUTH"
 
 exec ./op-reth node \
   -vvv \
-  --config /app/reth.toml \
   --datadir="$RETH_DATA_DIR" \
   --log.stdout.format log-fmt \
   --ws \