Remove pre-merge legacy code, remove compose V1 code

.github/check-service.sh

@@ -2,18 +2,18 @@
 
 __service=$1
 
-__containerID=$(docker-compose ps -q "${__service}")
+__containerID=$(docker compose ps -q "${__service}")
 
 __restart_count=$(docker inspect --format '{{ .RestartCount }}' "$__containerID")
 __is_running=$(docker inspect --format '{{ .State.Running }}' "$__containerID")
 
 if [ "$__is_running" != "true" ] || [ "$__restart_count" -gt 1 ]; then
   echo "$__service is either not running or continuously restarting"
-  docker-compose ps "${__service}"
-  docker-compose logs "${__service}"
+  docker compose ps "${__service}"
+  docker compose logs "${__service}"
   exit 1
 else
   echo "$__service is running"
-  docker-compose ps "${__service}"
+  docker compose ps "${__service}"
   exit 0
 fi

.github/workflows/test-grafana.yml

@@ -15,7 +15,10 @@ jobs:
       github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker buildx
+        uses: docker/setup-buildx-action@v3
       - name: Create .env file
         run: cp default.env .env
       - name: Set Lighthouse/Geth/Grafana

.github/workflows/test-lighthouse-reth.yml

@@ -16,7 +16,10 @@ jobs:
       github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker buildx
+        uses: docker/setup-buildx-action@v3
       - name: Create .env file
         run: cp default.env .env
       - name: Set Lighthouse/Reth

.github/workflows/test-lodestar-erigon.yml

@@ -16,7 +16,10 @@ jobs:
       github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker buildx
+        uses: docker/setup-buildx-action@v3
       - name: Create .env file
         run: cp default.env .env
       - name: Set Lodestar/Erigon

.github/workflows/test-nimbus-nethermind.yml

@@ -16,7 +16,10 @@ jobs:
       github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker buildx
+        uses: docker/setup-buildx-action@v3
       - name: Create .env file
         run: cp default.env .env
       - name: Set Nimbus/Nethermind

.github/workflows/test-prysm-geth.yml

@@ -16,7 +16,10 @@ jobs:
       github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker buildx
+        uses: docker/setup-buildx-action@v3
       - name: Create .env file
         run: cp default.env .env
       - name: Set Prysm/Geth

.github/workflows/test-teku-besu.yml

@@ -16,7 +16,10 @@ jobs:
       github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Docker buildx
+        uses: docker/setup-buildx-action@v3
       - name: Create .env file
         run: cp default.env .env
       - name: Set Teku/Besu

allin1-keyapi-shared.yml

@@ -0,0 +1,4 @@
+services:
+  consensus:
+    ports:
+      - ${SHARE_IP:-}:${KEY_API_PORT:-7500}:${KEY_API_PORT:-7500}/tcp

besu.yml

@@ -1,4 +1,3 @@
-version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file
@@ -20,6 +19,7 @@ services:
         - DOCKER_TAG=${BESU_DOCKER_TAG:-latest}
         - DOCKER_REPO=${BESU_DOCKER_REPO:-hyperledger/besu}
     image: besu:local
+    pull_policy: build
     user: besu
     environment:
       - JAVA_OPTS=${BESU_HEAP:--Xmx5g}
@@ -32,8 +32,8 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - jwtsecret:/var/lib/besu/ee-secret
     ports:
-      - ${HOST_IP:-}${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
-      - ${HOST_IP:-}${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
+      - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
+      - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
     networks:
       default:
         aliases:

central-metrics.yml

@@ -1,6 +1,4 @@
 # For scraping with central-proxy-docker, when all you want is the metrics exporter
-
-version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file
@@ -15,6 +13,7 @@ services:
     build:
       context: ./eth-metrics
     image: ethereum-metrics-exporter:local
+    pull_policy: build
     environment:
       - CLIENT=${COMPOSE_FILE}
     entrypoint:

cl-shared.yml

@@ -1,5 +1,4 @@
-version: "3.9"
 services:
   consensus:
     ports:
-      - ${SHARE_IP:-}${CL_REST_PORT:-5052}:${CL_REST_PORT:-5052}/tcp
+      - ${SHARE_IP:-}:${CL_REST_PORT:-5052}:${CL_REST_PORT:-5052}/tcp

cl-traefik.yml

@@ -1,7 +1,6 @@
 # To be used in conjunction with lodestar.yml, nimbus.yml, teku.yml, lighthouse.yml or prysm.yml, ditto their
 # -cl-only.yml versions
 # For remote validator setups only. Please be very cautious when exposing your consensus API port
-version: "3.9"
 services:
   consensus:
     labels:

default.env

@@ -70,12 +70,8 @@ BEACON_STATS_API=
 BEACON_STATS_MACHINE=
 
 # IP of the host you want to use in Docker (in case host has several IPs)
-# Note if you set it, and only then, you MUST append a colon to the end, like 1.2.3.4: or [2001:1:2::3]:, to work around
-# a limitation of compose V1, even when using compose V2
 HOST_IP=
-# IP address to use when host-mapping port through *-shared.yml. Set this to 127.0.0.1: to restrict the share to localhost
-# Note if you set it, and only then, you MUST append a colon to the end, like 1.2.3.4: or [2001:1:2::3]:, to work around
-# a limitation of compose V1, even when using compose V2
+# IP address to use when host-mapping a port through *-shared.yml. Set this to 127.0.0.1 to restrict the share to localhost
 SHARE_IP=
 
 # P2P ports you will forward to your staking node. Adjust here if you are

deposit-cli.yml

@@ -1,4 +1,3 @@
-version: "3.9"
 services:
   deposit-cli-new:
     profiles: ["tools"]
@@ -9,6 +8,7 @@ services:
         - BUILD_TARGET=${DEPCLI_SRC_BUILD_TARGET:-'$(git describe --tags $(git rev-list --tags --max-count=1))'}
         - SRC_REPO=${DEPCLI_SRC_REPO:-https://github.com/ethereum/staking-deposit-cli}
     image: staking-deposit-cli:local
+    pull_policy: build
     volumes:
       - ./.eth:/app/.eth/
     entrypoint:
@@ -27,6 +27,7 @@ services:
         - BUILD_TARGET=${DEPCLI_SRC_BUILD_TARGET:-'$(git describe --tags $(git rev-list --tags --max-count=1))'}
         - SRC_REPO=${DEPCLI_SRC_REPO:-https://github.com/ethereum/staking-deposit-cli}
     image: staking-deposit-cli:local
+    pull_policy: build
     volumes:
       - ./.eth:/app/.eth/
     entrypoint:
@@ -45,6 +46,7 @@ services:
         - SRC_REPO=${DEPCLI_SRC_REPO:-https://github.com/ethereum/staking-deposit-cli}
     restart: "no"
     image: staking-deposit-cli:local
+    pull_policy: build
     volumes:
       - ./.eth:/app/.eth
     entrypoint:

ee-shared.yml

@@ -1,7 +1,6 @@
 # To be used in conjunction with erigon.yml, nethermind.yml, besu.yml or geth.yml
 # For distributed setups only. Please be very cautious when exposing your engine API
-version: "3.9"
 services:
   execution:
     ports:
-      - ${SHARE_IP:-}${EE_PORT}:${EE_PORT:-8551}/tcp
+      - ${SHARE_IP:-}:${EE_PORT}:${EE_PORT:-8551}/tcp

ee-traefik.yml

@@ -1,6 +1,5 @@
 # To be used in conjunction with erigon.yml, nethermind.yml, besu.yml, reth.yml or geth.yml
 # For distributed setups only. Please be very cautious when exposing your engine port
-version: "3.9"
 services:
   execution:
     labels:

el-shared.yml

@@ -1,7 +1,6 @@
 # To be used in conjunction with erigon.yml, nethermind.yml, besu.yml or geth.yml
-version: "3.9"
 services:
   execution:
     ports:
-      - ${SHARE_IP:-}${EL_RPC_PORT}:${EL_RPC_PORT:-8545}/tcp
-      - ${SHARE_IP:-}${EL_WS_PORT}:${EL_WS_PORT:-8546}/tcp
+      - ${SHARE_IP:-}:${EL_RPC_PORT}:${EL_RPC_PORT:-8545}/tcp
+      - ${SHARE_IP:-}:${EL_WS_PORT}:${EL_WS_PORT:-8546}/tcp

el-traefik.yml

@@ -1,5 +1,4 @@
 # To be used in conjunction with erigon.yml, nethermind.yml, besu.yml, reth.yml or geth.yml
-version: "3.9"
 services:
   execution:
     labels:

erigon.yml

@@ -1,4 +1,3 @@
-version: "3.9"
 x-logging: &logging
   logging:
     driver: json-file
@@ -20,6 +19,7 @@ services:
         - DOCKER_REPO=${ERIGON_DOCKER_REPO:-thorax/erigon}
     stop_grace_period: 5m
     image: erigon:local
+    pull_policy: build
     user: erigon
     environment:
       - JWT_SECRET=${JWT_SECRET}
@@ -32,15 +32,15 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - jwtsecret:/var/lib/erigon/ee-secret
     ports:
-      - ${HOST_IP:-}${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
-      - ${HOST_IP:-}${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
-      - ${HOST_IP:-}${ERIGON_P2P_PORT_2:-30304}:${ERIGON_P2P_PORT_2:-30304}/tcp
-      - ${HOST_IP:-}${ERIGON_P2P_PORT_2:-30304}:${ERIGON_P2P_PORT_2:-30304}/udp
-      - ${HOST_IP:-}${ERIGON_P2P_PORT_3:-30305}:${ERIGON_P2P_PORT_3:-30305}/tcp
-      - ${HOST_IP:-}${ERIGON_P2P_PORT_3:-30305}:${ERIGON_P2P_PORT_3:-30305}/udp
+      - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/tcp
+      - ${HOST_IP:-}:${EL_P2P_PORT:-30303}:${EL_P2P_PORT:-30303}/udp
+      - ${HOST_IP:-}:${ERIGON_P2P_PORT_2:-30304}:${ERIGON_P2P_PORT_2:-30304}/tcp
+      - ${HOST_IP:-}:${ERIGON_P2P_PORT_2:-30304}:${ERIGON_P2P_PORT_2:-30304}/udp
+      - ${HOST_IP:-}:${ERIGON_P2P_PORT_3:-30305}:${ERIGON_P2P_PORT_3:-30305}/tcp
+      - ${HOST_IP:-}:${ERIGON_P2P_PORT_3:-30305}:${ERIGON_P2P_PORT_3:-30305}/udp
       # torrent ports
-      - ${HOST_IP:-}${ERIGON_TORRENT_PORT:-42069}:${ERIGON_TORRENT_PORT:-42069}/tcp
-      - ${HOST_IP:-}${ERIGON_TORRENT_PORT:-42069}:${ERIGON_TORRENT_PORT:-42069}/udp
+      - ${HOST_IP:-}:${ERIGON_TORRENT_PORT:-42069}:${ERIGON_TORRENT_PORT:-42069}/tcp
+      - ${HOST_IP:-}:${ERIGON_TORRENT_PORT:-42069}:${ERIGON_TORRENT_PORT:-42069}/udp
     networks:
       default:
         aliases: