Remove RESTART; keymanager on configured API port

succinctlabs · Aug 10, 2022 · c4111f4 · c4111f4
1 parent e2b9bc2
commit c4111f4
Show file tree

Hide file tree

Showing 28 changed files with 57 additions and 46 deletions.
diff --git a/akula.yml b/akula.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   execution:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./akula
       dockerfile: ${AKULA_DOCKERFILE}

diff --git a/alerts.yml b/alerts.yml
@@ -1,7 +1,7 @@
 version: "3.4"
 services:
   alertmanager:
-    restart: ${RESTART}
+    restart: "unless-stopped"
     image: prom/alertmanager
     volumes:
       - alertmanager-data:/alertmanager

diff --git a/besu.yml b/besu.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   execution:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     stop_grace_period: 3m
     build:
       context: ./besu

diff --git a/blox-ssv.yml b/blox-ssv.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   ssv-node:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     image: bloxstaking/ssv-node:${SSV_NODE_TAG:-latest}
     user: 12000:12000
     volumes:

diff --git a/default.env b/default.env
@@ -93,8 +93,6 @@ CL_REST_PORT=5052
 #GETH_CACHE=--cache=256
 GETH_CACHE=
 
-# Restart policy: Set to no if you do not want services to automatically restart
-RESTART=unless-stopped
 # If you want debug logs, set this to debug instead of info
 LOG_LEVEL=info
 

diff --git a/erigon.yml b/erigon.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   execution:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./erigon
       dockerfile: ${ERIGON_DOCKERFILE}

diff --git a/ethd b/ethd
@@ -336,7 +336,7 @@ envmigrate() {
             PROM_HOST PRYSM_HOST EE_HOST EL_HOST EL_LB EL_WS_HOST EL_WS_LB CL_HOST CL_LB DDNS_SUBDOMAIN DDNS_PROXY RAPID_SYNC_URL \
             CL_NODE BEACON_STATS_API BEACON_STATS_MACHINE EL_P2P_PORT CL_P2P_PORT PRYSM_PORT DOPPELGANGER \
             PRYSM_UDP_PORT GRAFANA_PORT KEY_API_PORT TRAEFIK_WEB_PORT TRAEFIK_WEB_HTTP_PORT CL_REST_PORT \
-            EL_RPC_PORT EL_WS_PORT EE_PORT ERIGON_TORRENT_PORT RESTART LOG_LEVEL JWT_SECRET GETH_CACHE SSV_P2P_PORT SSV_P2P_PORT_UDP )
+            EL_RPC_PORT EL_WS_PORT EE_PORT ERIGON_TORRENT_PORT LOG_LEVEL JWT_SECRET GETH_CACHE SSV_P2P_PORT SSV_P2P_PORT_UDP )
     TARGET_VARS=( NIM_SRC_BUILD_TARGET NIM_DOCKER_TAG NIM_DOCKERFILE TEKU_SRC_BUILD_TARGET TEKU_DOCKER_TAG \
                 TEKU_DOCKERFILE LH_SRC_BUILD_TARGET LH_DOCKER_TAG LH_DOCKERFILE PRYSM_SRC_BUILD_TARGET \
                 PRYSM_DOCKER_TAG PRYSM_DOCKERFILE ERIGON_SRC_BUILD_TARGET ERIGON_DOCKER_TAG ERIGON_DOCKERFILE \

diff --git a/geth.yml b/geth.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   execution:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./geth
       dockerfile: ${GETH_DOCKERFILE}

diff --git a/grafana.yml b/grafana.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   prometheus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./prometheus
     image: prometheus:local
@@ -46,7 +46,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     <<: *logging
   blackbox-exporter:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     image: prom/blackbox-exporter:master
     volumes:
       - ./prometheus/blackbox.yml:/config/blackbox.yml
@@ -55,7 +55,7 @@ services:
     command:
       - --config.file=/config/blackbox.yml
   json-exporter:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     image: quay.io/prometheuscommunity/json-exporter
     volumes:
       - ./prometheus/json.yml:/config/json.yml
@@ -65,7 +65,7 @@ services:
       - --config.file
       - /config/json.yml
   cryptowat-exporter:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     image: nbarrientos/cryptowat_exporter
     volumes:
       - /etc/localtime:/etc/localtime:ro
@@ -85,7 +85,7 @@ services:
       - /var/lib/docker/containers:/var/lib/docker/containers:ro
     command:
       - '--config.file=/etc/promtail/promtail.yml'
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     depends_on:
       - loki
     <<: *logging
@@ -96,10 +96,10 @@ services:
       - ./loki:/etc/loki
     command:
       - '--config.file=/etc/loki/loki.yml'
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     <<: *logging
   grafana:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./grafana
     image: grafana:local

diff --git a/lighthouse-base.yml b/lighthouse-base.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   consensus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./lighthouse
       dockerfile: ${LH_DOCKERFILE}
@@ -72,7 +72,7 @@ services:
       - ${FEE_RECIPIENT}
 
   validator:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     image: lighthouse:merge
     user: lhvalidator
     environment:
@@ -180,6 +180,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-}
+      - KEY_API_PORT=${KEY_API_PORT:-7500}
     depends_on:
       - validator
     entrypoint:

diff --git a/lighthouse-cl-only.yml b/lighthouse-cl-only.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   consensus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./lighthouse
       dockerfile: ${LH_DOCKERFILE}

diff --git a/lighthouse-vc-only.yml b/lighthouse-vc-only.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   validator:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./lighthouse
       dockerfile: ${LH_DOCKERFILE}
@@ -119,6 +119,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-}
+      - KEY_API_PORT=${KEY_API_PORT:-7500}
     depends_on:
       - validator
     entrypoint:

diff --git a/lodestar-base.yml b/lodestar-base.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   consensus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./lodestar
       dockerfile: ${LS_DOCKERFILE}
@@ -66,7 +66,7 @@ services:
       - ${FEE_RECIPIENT}
 
   validator:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     image: lodestar:merge
     user: lsvalidator
     environment:
@@ -105,7 +105,7 @@ services:
 
   validator-import:
     profiles: ["tools"]
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     image: lodestar:merge
     user: root
     volumes:
@@ -169,6 +169,7 @@ services:
     environment:
       - LSBUGGED="true"
       - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-}
+      - KEY_API_PORT=${KEY_API_PORT:-7500}
     depends_on:
       - validator
     entrypoint:

diff --git a/lodestar-cl-only.yml b/lodestar-cl-only.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   consensus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./lodestar
       dockerfile: ${LS_DOCKERFILE}

diff --git a/lodestar-vc-only.yml b/lodestar-vc-only.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   validator:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     image: lodestar:merge
     user: lsvalidator
     environment:
@@ -46,7 +46,7 @@ services:
 
   validator-import:
     profiles: ["tools"]
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     image: lodestar:merge
     user: root
     volumes:
@@ -108,6 +108,7 @@ services:
     environment:
       - LSBUGGED="true"
       - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-}
+      - KEY_API_PORT=${KEY_API_PORT:-7500}
     depends_on:
       - validator
     entrypoint:

diff --git a/mev-boost.yml b/mev-boost.yml
@@ -8,7 +8,7 @@ x-logging: &logging
 
 services:
   mev-boost:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./flashbots
       dockerfile: ${MEV_DOCKERFILE}

diff --git a/nethermind.yml b/nethermind.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   execution:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     stop_grace_period: 3m
     stop_signal: SIGINT
     build:

diff --git a/nimbus-base.yml b/nimbus-base.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   consensus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./nimbus
       args:
@@ -120,6 +120,7 @@ services:
     environment:
       - NIMBUGGED="true"
       - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-}
+      - KEY_API_PORT=${KEY_API_PORT:-7500}
     depends_on:
       - consensus
     entrypoint:

diff --git a/nimbus-cl-only.yml b/nimbus-cl-only.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   consensus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./nimbus
       args:

diff --git a/prysm-base.yml b/prysm-base.yml
@@ -16,7 +16,7 @@ x-build: &prysm-build
 
 services:
   consensus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       target: consensus
       <<: *prysm-build
@@ -73,7 +73,7 @@ services:
       - ${FEE_RECIPIENT}
 
   validator:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       target: validator
       <<: *prysm-build
@@ -202,6 +202,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-}
+      - KEY_API_PORT=${KEY_API_PORT:-7500}
       - PRYSM="true"
     depends_on:
       - validator

diff --git a/prysm-cl-only.yml b/prysm-cl-only.yml
@@ -16,7 +16,7 @@ x-build: &prysm-build
 
 services:
   consensus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       target: consensus
       <<: *prysm-build

diff --git a/prysm-vc-only.yml b/prysm-vc-only.yml
@@ -16,7 +16,7 @@ x-build: &prysm-build
 
 services:
   validator:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       target: validator
       <<: *prysm-build
@@ -139,6 +139,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
     environment:
       - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-}
+      - KEY_API_PORT=${KEY_API_PORT:-7500}
       - PRYSM="true"
     depends_on:
       - validator

diff --git a/teku-base.yml b/teku-base.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   consensus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./teku
       args:
@@ -110,6 +110,7 @@ services:
     environment:
       - TLS="true"
       - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-}
+      - KEY_API_PORT=${KEY_API_PORT:-7500}
     depends_on:
       - consensus
     entrypoint:

diff --git a/teku-cl-only.yml b/teku-cl-only.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   consensus:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./teku
       args:

diff --git a/teku-vc-only.yml b/teku-vc-only.yml
@@ -9,7 +9,7 @@ x-logging: &logging
 
 services:
   validator:
-    restart: "${RESTART}"
+    restart: "unless-stopped"
     build:
       context: ./teku
       args:
@@ -83,6 +83,7 @@ services:
     environment:
       - TLS="true"
       - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD:-}
+      - KEY_API_PORT=${KEY_API_PORT:-7500}
     depends_on:
       - validator
     entrypoint:

diff --git a/traefik-aws.yml b/traefik-aws.yml
@@ -12,7 +12,7 @@ services:
     image: traefik-aws
     build:
       context: ./traefik
-    restart: ${RESTART}
+    restart: "unless-stopped"
     command:
 #      - --log.level=DEBUG
 #      - --accesslog=true