Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ services:
image: ${GWW_IMAGE_TAG_OVERRIDE:-${GWW_IMAGE_TAG_DEFAULT}}
user: root
container_name: {{.Smartnode.ProjectName}}_addon_gww
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
volumes:
- {{.RocketPoolDirectory}}/addons/gww:/gww
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ services:
alertmanager:
image: ${ALERTMANAGER_IMAGE_TAG_OVERRIDE:-${ALERTMANAGER_IMAGE_TAG_DEFAULT}}
container_name: {{.Smartnode.ProjectName}}_alertmanager
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
command:
# https://prometheus.io/docs/alerting/latest/configuration/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ services:
commit-boost:
image: ${COMMIT_BOOST_IMAGE_TAG_OVERRIDE:-${COMMIT_BOOST_IMAGE_TAG_DEFAULT}}
container_name: {{.Smartnode.ProjectName}}_commit-boost
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
ports: [{{.GetCommitBoostOpenPorts}}]
volumes:
Expand Down
5 changes: 5 additions & 0 deletions shared/services/rocketpool/assets/install/templates/eth1.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ services:
image: ${EC_IMAGE_TAG_OVERRIDE:-${EC_IMAGE_TAG_DEFAULT}}
user: root
container_name: {{.Smartnode.ProjectName}}_eth1
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
stop_signal: {{.GetECStopSignal}}
stop_grace_period: 15m
Expand Down
10 changes: 10 additions & 0 deletions shared/services/rocketpool/assets/install/templates/eth2.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
image: ${CURL_IMAGE_TAG_OVERRIDE:-${CURL_IMAGE_TAG_DEFAULT}}
user: root
container_name: {{.Smartnode.ProjectName}}_genesis_downloader
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
volumes:
- eth2clientdata:/ethclient
- {{.RocketPoolDirectory}}/scripts:/setup:ro
Expand All @@ -29,6 +34,11 @@ services:
image: ${BN_IMAGE_TAG_OVERRIDE:-${BN_IMAGE_TAG_DEFAULT}}
user: root
container_name: {{.Smartnode.ProjectName}}_eth2
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
stop_grace_period: 3m
{{- $p2p := (or .ConsensusCommon.P2pPort.String "9001")}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ services:
node-exporter:
image: ${EXPORTER_IMAGE_TAG_OVERRIDE:-${EXPORTER_IMAGE_TAG_DEFAULT}}
container_name: {{.Smartnode.ProjectName}}_exporter
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
cap_drop:
- ALL
user: "65534:65534"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ services:
grafana:
image: ${GRAFANA_IMAGE_TAG_OVERRIDE:-${GRAFANA_IMAGE_TAG_DEFAULT}}
container_name: {{.Smartnode.ProjectName}}_grafana
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
environment:
- GF_SERVER_HTTP_PORT={{$port}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ services:
mev-boost:
image: ${MEV_BOOST_IMAGE_TAG_OVERRIDE:-${MEV_BOOST_IMAGE_TAG_DEFAULT}}
container_name: {{.Smartnode.ProjectName}}_mev-boost
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
ports: [{{.GetMevBoostOpenPorts}}]
volumes:
Expand Down
5 changes: 5 additions & 0 deletions shared/services/rocketpool/assets/install/templates/node.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ services:
node:
image: ${SMARTNODE_IMAGE_TAG_OVERRIDE:-${SMARTNODE_IMAGE_TAG_DEFAULT}}
container_name: {{.Smartnode.ProjectName}}_node
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
tty: true
ports: [{{.GetNodeOpenPorts}}]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ services:
prometheus:
image: ${PROMETHEUS_IMAGE_TAG_OVERRIDE:-${PROMETHEUS_IMAGE_TAG_DEFAULT}}
container_name: {{.Smartnode.ProjectName}}_prometheus
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
command:
- "--web.listen-address=:{{or .Prometheus.Port.Value "9091"}}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ services:
image: ${VC_IMAGE_TAG_OVERRIDE:-${VC_IMAGE_TAG_DEFAULT}}
user: root
container_name: {{.Smartnode.ProjectName}}_validator
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
stop_grace_period: 3m
volumes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ services:
watchtower:
image: ${SMARTNODE_IMAGE_TAG_OVERRIDE:-${SMARTNODE_IMAGE_TAG_DEFAULT}}
container_name: {{.Smartnode.ProjectName}}_watchtower
logging:
driver: json-file
options:
max-size: "100m"
max-file: "3"
restart: unless-stopped
tty: true
volumes:
Expand Down
4 changes: 2 additions & 2 deletions shared/services/rocketpool/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@ func (c *Client) resolvedImage(key, fallback string) string {

// Creates a marker file on the execution client volume (used for prune and DB migrations).
func (c *Client) TouchEthclientMarker(container, volume, marker string) error {
cmd := fmt.Sprintf("docker run --rm --name %s -v %s:/ethclient %s sh -c 'touch /ethclient/%s'", container, volume, shellescape.Quote(c.resolvedImage(config.ImageAlpine, "alpine:3.24.2")), marker)
cmd := fmt.Sprintf("docker run --rm --log-driver json-file --log-opt max-size=100m --log-opt max-file=3 --name %s -v %s:/ethclient %s sh -c 'touch /ethclient/%s'", container, volume, shellescape.Quote(c.resolvedImage(config.ImageAlpine, "alpine:3.24.2")), marker)
output, err := c.readOutput(cmd)
if err != nil {
return err
Expand Down Expand Up @@ -986,7 +986,7 @@ func (c *Client) RunNethermindPruneStarter(executionContainerName string) error

for i := 0; i < retryCount; i++ {
command := fmt.Sprintf(`-m 30 -H "Content-Type: application/json" -X POST --data '{"jsonrpc":"2.0","method":"admin_prune","params":[],"id":%d}' %s`, i+1, nethermindAdminUrl)
cmdText := fmt.Sprintf(`docker run --quiet --rm --name curl%s --network container:%s %s -Ss %s`, pruneStarterContainerSuffix, executionContainerName, shellescape.Quote(c.resolvedImage(config.ImageCurl, "curlimages/curl:8.22.0")), command)
cmdText := fmt.Sprintf(`docker run --quiet --rm --log-driver json-file --log-opt max-size=100m --log-opt max-file=3 --name curl%s --network container:%s %s -Ss %s`, pruneStarterContainerSuffix, executionContainerName, shellescape.Quote(c.resolvedImage(config.ImageCurl, "curlimages/curl:8.22.0")), command)

if i != 0 {
fmt.Printf("Trying again in %v... (%d/%d)\n", retryTime, i+1, retryCount)
Expand Down
Loading