Make maru versions OCI-observable and fix metrics scrape path.
Re-label consensys/maru FROM tag into image OCI labels (upstream leaves version/vcs-ref empty) and scrape /metrics on :9090 instead of the 404ing /debug/metrics/prometheus path. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -150,7 +150,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-mainnet-besu-pruned-bonsai:
|
||||
|
||||
@@ -150,7 +150,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-sepolia-besu-pruned-bonsai:
|
||||
|
||||
@@ -139,7 +139,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-mainnet-erigon3-archive-trace:
|
||||
|
||||
@@ -140,7 +140,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-mainnet-erigon3-minimal-trace:
|
||||
|
||||
@@ -140,7 +140,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-mainnet-erigon3-pruned-trace:
|
||||
|
||||
@@ -139,7 +139,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-sepolia-erigon3-archive-trace:
|
||||
|
||||
@@ -140,7 +140,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-sepolia-erigon3-minimal-trace:
|
||||
|
||||
@@ -140,7 +140,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-sepolia-erigon3-pruned-trace:
|
||||
|
||||
@@ -150,7 +150,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-mainnet-geth-archive-leveldb-hash:
|
||||
|
||||
@@ -150,7 +150,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-mainnet-geth-pruned-pebble-path:
|
||||
|
||||
@@ -140,7 +140,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-sepolia-geth-archive-leveldb-hash:
|
||||
|
||||
@@ -140,7 +140,7 @@ services:
|
||||
labels:
|
||||
- prometheus-scrape.enabled=true
|
||||
- prometheus-scrape.port=9090
|
||||
- prometheus-scrape.path=/debug/metrics/prometheus
|
||||
- prometheus-scrape.path=/metrics
|
||||
|
||||
volumes:
|
||||
linea-sepolia-geth-pruned-pebble-path:
|
||||
|
||||
@@ -2,4 +2,22 @@ ARG MARU_IMAGE=consensys/maru
|
||||
ARG MARU_VERSION=bcfdb4
|
||||
FROM ${MARU_IMAGE}:${MARU_VERSION}
|
||||
|
||||
RUN apt-get update && apt-get install -y gettext && rm -rf /var/lib/apt/lists/*
|
||||
# Re-declare so LABEL can see the build-arg (FROM clears prior ARGs).
|
||||
# Upstream consensys/maru leaves org.label-schema.version/vcs-ref empty;
|
||||
# without this, locally-built rpc-*-node images only expose Ubuntu's
|
||||
# org.opencontainers.image.version=24.04 — useless for outdated detection.
|
||||
ARG MARU_VERSION
|
||||
ARG MARU_IMAGE
|
||||
LABEL org.opencontainers.image.title="maru" \
|
||||
org.opencontainers.image.description="Consensus Client for Linea" \
|
||||
org.opencontainers.image.source="https://github.com/Consensys/maru" \
|
||||
org.opencontainers.image.version="${MARU_VERSION}" \
|
||||
org.opencontainers.image.revision="${MARU_VERSION}" \
|
||||
org.label-schema.name="maru" \
|
||||
org.label-schema.version="${MARU_VERSION}" \
|
||||
org.label-schema.vcs-ref="${MARU_VERSION}" \
|
||||
org.label-schema.vcs-url="https://github.com/ConsenSys/maru" \
|
||||
vibe.maru.from_image="${MARU_IMAGE}" \
|
||||
vibe.maru.from_tag="${MARU_VERSION}"
|
||||
|
||||
RUN apt-get update && apt-get install -y gettext && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
Reference in New Issue
Block a user