diff --git a/.images.lock.yaml b/.images.lock.yaml index 515da1f..31ffbbc 100644 --- a/.images.lock.yaml +++ b/.images.lock.yaml @@ -6,11 +6,11 @@ overrides: newImage: index.docker.io/utxobr/monero-exporter@sha256:737413b1054583535e835e1417b61a8d59a4c08723e4a15c61c4249c2a7d69a4 preresolved: true - image: monero-exporter-grafana - newImage: index.docker.io/utxobr/monero-exporter-grafana@sha256:eb06f3451432e26ce17e78283ced2814952fdf715cae9916bc9584f283a92078 + newImage: index.docker.io/utxobr/monero-exporter-grafana@sha256:0e9f595487e7ee07f9059f75c302ce56fbe559074c0ba95a1d46a9a3c1c859a2 preresolved: true - image: monero-exporter-monerod - newImage: index.docker.io/utxobr/monero-exporter-monerod@sha256:f5b6d355ab09b5372434dfacef21421407166c0b4e5c742ae8e57bfd194c53c0 + newImage: index.docker.io/utxobr/monero-exporter-monerod@sha256:19d889447ba4f703957d952ac753b330d5a2d7e324c98eac1f0f3d8bf2744817 preresolved: true - image: monero-exporter-prometheus - newImage: index.docker.io/utxobr/monero-exporter-prometheus@sha256:ff7bad10b24e26dec5d51211071dd05efbd2bd92bcd10dbb1882ded3ce36af73 + newImage: index.docker.io/utxobr/monero-exporter-prometheus@sha256:21fcd719c6a3c8de35d513887e6666a5c49a15be742e328c034511cd60b5573e preresolved: true diff --git a/examples/docker-compose.yaml b/examples/docker-compose.yaml index 1068c82..bbcbb61 100644 --- a/examples/docker-compose.yaml +++ b/examples/docker-compose.yaml @@ -4,7 +4,7 @@ services: command: - -config=/etc/grafana/grafana.ini container_name: grafana - image: index.docker.io/utxobr/monero-exporter-grafana@sha256:eb06f3451432e26ce17e78283ced2814952fdf715cae9916bc9584f283a92078 + image: index.docker.io/utxobr/monero-exporter-grafana@sha256:0e9f595487e7ee07f9059f75c302ce56fbe559074c0ba95a1d46a9a3c1c859a2 ports: - 3000:3000 volumes: @@ -35,7 +35,7 @@ services: - --rpc-restricted-bind-ip=0.0.0.0 - --rpc-restricted-bind-port=18089 container_name: monerod - image: index.docker.io/utxobr/monero-exporter-monerod@sha256:f5b6d355ab09b5372434dfacef21421407166c0b4e5c742ae8e57bfd194c53c0 + image: index.docker.io/utxobr/monero-exporter-monerod@sha256:19d889447ba4f703957d952ac753b330d5a2d7e324c98eac1f0f3d8bf2744817 ports: - 18080:18080 - 18089:18089 @@ -47,7 +47,7 @@ services: - --storage.tsdb.path=/data - --storage.tsdb.retention.time=30d container_name: prometheus - image: index.docker.io/utxobr/monero-exporter-prometheus@sha256:ff7bad10b24e26dec5d51211071dd05efbd2bd92bcd10dbb1882ded3ce36af73 + image: index.docker.io/utxobr/monero-exporter-prometheus@sha256:21fcd719c6a3c8de35d513887e6666a5c49a15be742e328c034511cd60b5573e volumes: - prometheus-data:/data - ./prometheus/config.yaml:/etc/prometheus/config.yaml:ro diff --git a/examples/grafana/Dockerfile b/examples/grafana/Dockerfile index 11d221f..a3711aa 100644 --- a/examples/grafana/Dockerfile +++ b/examples/grafana/Dockerfile @@ -1,5 +1,5 @@ -ARG BUILDER_IMAGE=index.docker.io/library/ubuntu@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 -ARG RUNTIME_IMAGE=gcr.io/distroless/base@sha256:bc84925113289d139a9ef2f309f0dd7ac46ea7b786f172ba9084ffdb4cbd9490 +ARG BUILDER_IMAGE=index.docker.io/library/ubuntu@sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 +ARG RUNTIME_IMAGE=gcr.io/distroless/base@sha256:97f9cbf81590c7dd878d7e10c20116fa7488c2fb91b3c839df1ebdcb61ab13ca FROM $BUILDER_IMAGE AS builder diff --git a/examples/monerod/Dockerfile b/examples/monerod/Dockerfile index c066ab7..f286960 100644 --- a/examples/monerod/Dockerfile +++ b/examples/monerod/Dockerfile @@ -1,5 +1,5 @@ -ARG BUILDER_IMAGE=index.docker.io/library/ubuntu@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 -ARG RUNTIME_IMAGE=gcr.io/distroless/base@sha256:bc84925113289d139a9ef2f309f0dd7ac46ea7b786f172ba9084ffdb4cbd9490 +ARG BUILDER_IMAGE=index.docker.io/library/ubuntu@sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 +ARG RUNTIME_IMAGE=gcr.io/distroless/base@sha256:97f9cbf81590c7dd878d7e10c20116fa7488c2fb91b3c839df1ebdcb61ab13ca FROM $BUILDER_IMAGE AS builder @@ -15,15 +15,16 @@ FROM $BUILDER_IMAGE AS builder curl -SOL https://downloads.getmonero.org/cli/monero-linux-x64-v${MONERO_VERSION}.tar.bz2 && \ echo "${MONERO_SHA256} monero-linux-x64-v${MONERO_VERSION}.tar.bz2" | sha256sum -c && \ tar xf monero-linux-x64-v${MONERO_VERSION}.tar.bz2 --strip-components=1 && \ - mv ./monerod /usr/local/bin/monerod + mv ./monerod ./monero-wallet-rpc /usr/local/bin RUN mkdir /data FROM $RUNTIME_IMAGE - COPY --from=builder --chown=nonroot:nonroot /data /data - COPY --from=builder --chown=nonroot:nonroot /usr/local/bin/monerod /usr/local/bin/monerod + COPY --from=builder --chown=nonroot:nonroot /data /data + COPY --from=builder --chown=nonroot:nonroot /usr/local/bin/monerod /usr/local/bin/monerod + COPY --from=builder --chown=nonroot:nonroot /usr/local/bin/monero-wallet-rpc /usr/local/bin/monero-wallet-rpc USER nonroot:nonroot ENTRYPOINT [ "monerod", "--non-interactive" ] diff --git a/examples/prometheus/Dockerfile b/examples/prometheus/Dockerfile index 13324c9..99b0e72 100644 --- a/examples/prometheus/Dockerfile +++ b/examples/prometheus/Dockerfile @@ -1,5 +1,5 @@ -ARG BUILDER_IMAGE=index.docker.io/library/ubuntu@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93 -ARG RUNTIME_IMAGE=gcr.io/distroless/base@sha256:bc84925113289d139a9ef2f309f0dd7ac46ea7b786f172ba9084ffdb4cbd9490 +ARG BUILDER_IMAGE=index.docker.io/library/ubuntu@sha256:82becede498899ec668628e7cb0ad87b6e1c371cb8a1e597d83a47fac21d6af3 +ARG RUNTIME_IMAGE=gcr.io/distroless/base@sha256:97f9cbf81590c7dd878d7e10c20116fa7488c2fb91b3c839df1ebdcb61ab13ca FROM $BUILDER_IMAGE AS builder