From b709d3ba0b836e7970c70f8e0d062c487ff5d287 Mon Sep 17 00:00:00 2001 From: Fran Arbanas Date: Fri, 28 Feb 2025 14:01:33 +0100 Subject: [PATCH] Fix/pull from harbor (#5521) * fix: pull from harbor instead of dockerhub * add remaining * add comments saying that these changes will only work with VPN --- nym-api.dockerfile | 3 ++- nym-credential-proxy/nym-credential-proxy/Dockerfile | 5 +++-- nym-network-monitor.dockerfile | 3 ++- nym-node-status-api/nym-node-status-agent/Dockerfile | 7 ++++--- nym-node-status-api/nym-node-status-api/Dockerfile | 5 +++-- nym-node-status-api/nym-node-status-api/Dockerfile.dev | 2 +- nym-node/Dockerfile | 5 +++-- nym-validator-rewarder/Dockerfile | 5 +++-- nyx-chain-watcher/Dockerfile | 5 +++-- 9 files changed, 24 insertions(+), 16 deletions(-) diff --git a/nym-api.dockerfile b/nym-api.dockerfile index 7ee95379dc..5701fbb395 100644 --- a/nym-api.dockerfile +++ b/nym-api.dockerfile @@ -1,4 +1,5 @@ -FROM rust:latest AS builder +# this will only work with VPN, otherwise remove the harbor part +FROM harbor.nymte.ch/dockerhub/rust:latest AS builder COPY ./ /usr/src/nym WORKDIR /usr/src/nym/nym-api diff --git a/nym-credential-proxy/nym-credential-proxy/Dockerfile b/nym-credential-proxy/nym-credential-proxy/Dockerfile index b6da10f4f5..e0fbc7fc05 100644 --- a/nym-credential-proxy/nym-credential-proxy/Dockerfile +++ b/nym-credential-proxy/nym-credential-proxy/Dockerfile @@ -1,4 +1,5 @@ -FROM rust:latest AS builder +# this will only work with VPN, otherwise remove the harbor part +FROM harbor.nymte.ch/dockerhub/rust:latest AS builder COPY ./ /usr/src/nym WORKDIR /usr/src/nym/nym-credential-proxy/nym-credential-proxy @@ -24,7 +25,7 @@ RUN cargo build --release # see https://github.com/nymtech/nym/blob/develop/nym-credential-proxy/nym-credential-proxy/src/cli.rs for details #------------------------------------------------------------------- -FROM ubuntu:24.04 +FROM harbor.nymte.ch/dockerhub/ubuntu:24.04 RUN apt update && apt install -yy curl ca-certificates diff --git a/nym-network-monitor.dockerfile b/nym-network-monitor.dockerfile index f25b93156e..22a2ca0c1d 100644 --- a/nym-network-monitor.dockerfile +++ b/nym-network-monitor.dockerfile @@ -1,4 +1,5 @@ -FROM rust:latest AS builder +# this will only work with VPN, otherwise remove the harbor part +FROM harbor.nymte.ch/dockerhub/rust:latest AS builder COPY ./ /usr/src/nym WORKDIR /usr/src/nym/nym-network-monitor diff --git a/nym-node-status-api/nym-node-status-agent/Dockerfile b/nym-node-status-api/nym-node-status-agent/Dockerfile index b50ce8be3d..fcab377e26 100644 --- a/nym-node-status-api/nym-node-status-agent/Dockerfile +++ b/nym-node-status-api/nym-node-status-agent/Dockerfile @@ -1,4 +1,5 @@ -FROM rust:latest AS builder +# this will only work with VPN, otherwise remove the harbor part +FROM harbor.nymte.ch/dockerhub/rust:latest AS builder ARG GIT_REF=main @@ -27,7 +28,7 @@ RUN cargo build --release # see https://github.com/nymtech/nym/blob/develop/nym-node-status-agent/src/cli.rs for details #------------------------------------------------------------------- -FROM ubuntu:24.04 +FROM harbor.nymte.ch/dockerhub/ubuntu:24.04 RUN apt-get update && apt-get install -y ca-certificates @@ -37,4 +38,4 @@ COPY --from=builder /usr/src/nym/target/release/nym-node-status-agent ./ COPY --from=builder /usr/src/nym-vpn-client/nym-vpn-core/target/release/nym-gateway-probe ./ ENV NODE_STATUS_AGENT_PROBE_PATH=/nym/nym-gateway-probe -ENTRYPOINT [ "/nym/nym-node-status-agent", "run-probe" ] \ No newline at end of file +ENTRYPOINT [ "/nym/nym-node-status-agent", "run-probe" ] diff --git a/nym-node-status-api/nym-node-status-api/Dockerfile b/nym-node-status-api/nym-node-status-api/Dockerfile index 035f186c65..6eeaf8c6ee 100644 --- a/nym-node-status-api/nym-node-status-api/Dockerfile +++ b/nym-node-status-api/nym-node-status-api/Dockerfile @@ -1,4 +1,5 @@ -FROM rust:latest AS builder +# this will only work with VPN, otherwise remove the harbor part +FROM harbor.nymte.ch/dockerhub/rust:latest AS builder COPY ./ /usr/src/nym WORKDIR /usr/src/nym/nym-node-status-api @@ -26,7 +27,7 @@ RUN cargo build --release # see https://github.com/nymtech/nym/blob/develop/nym-node-status-api/src/cli.rs for details #------------------------------------------------------------------- -FROM ubuntu:24.04 +FROM harbor.nymte.ch/dockerhub/ubuntu:24.04 RUN apt-get update && apt-get install -y ca-certificates diff --git a/nym-node-status-api/nym-node-status-api/Dockerfile.dev b/nym-node-status-api/nym-node-status-api/Dockerfile.dev index 2967a6e605..3811074734 100644 --- a/nym-node-status-api/nym-node-status-api/Dockerfile.dev +++ b/nym-node-status-api/nym-node-status-api/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM harbor.nymte.ch/dockerhub/ubuntu:22.04 RUN apt-get update && apt-get install -y ca-certificates diff --git a/nym-node/Dockerfile b/nym-node/Dockerfile index 53faa4ce3f..d7ef3012f2 100644 --- a/nym-node/Dockerfile +++ b/nym-node/Dockerfile @@ -1,4 +1,5 @@ -FROM rust:latest AS builder +# this will only work with VPN, otherwise remove the harbor part +FROM harbor.nymte.ch/dockerhub/rust:latest AS builder COPY ./ /usr/src/nym WORKDIR /usr/src/nym/nym-node @@ -65,7 +66,7 @@ RUN cargo build --release # see https://github.com/nymtech/nym/blob/develop/nym-node/src/env.rs for details #------------------------------------------------------------------- -FROM ubuntu:24.04 +FROM harbor.nymte.ch/dockerhub/ubuntu:24.04 WORKDIR /nym diff --git a/nym-validator-rewarder/Dockerfile b/nym-validator-rewarder/Dockerfile index e4543a16a7..c690adb9c6 100644 --- a/nym-validator-rewarder/Dockerfile +++ b/nym-validator-rewarder/Dockerfile @@ -1,4 +1,5 @@ -FROM rust:latest AS builder +# this will only work with VPN, otherwise remove the harbor part +FROM harbor.nymte.ch/dockerhub/rust:latest AS builder COPY ./ /usr/src/nym WORKDIR /usr/src/nym/nym-validator-rewarder @@ -16,7 +17,7 @@ RUN cargo build --release # see https://github.com/nymtech/nym/blob/develop/nym-validator-rewarder/src/cli/mod.rs for details #------------------------------------------------------------------- -FROM ubuntu:24.04 +FROM harbor.nymte.ch/dockerhub/ubuntu:24.04 RUN apt-get update && apt-get install -y ca-certificates diff --git a/nyx-chain-watcher/Dockerfile b/nyx-chain-watcher/Dockerfile index e4419d4664..57076b18b7 100644 --- a/nyx-chain-watcher/Dockerfile +++ b/nyx-chain-watcher/Dockerfile @@ -1,4 +1,5 @@ -FROM rust:latest AS builder +# this will only work with VPN, otherwise remove the harbor part +FROM harbor.nymte.ch/dockerhub/rust:latest AS builder COPY ./ /usr/src/nym WORKDIR /usr/src/nym/nyx-chain-watcher @@ -21,7 +22,7 @@ RUN cargo build --release # and https://github.com/nymtech/nym/blob/develop/nyx-chain-watcher/src/env.rs for env vars #------------------------------------------------------------------- -FROM ubuntu:24.04 +FROM harbor.nymte.ch/dockerhub/ubuntu:24.04 RUN apt update && apt install -yy curl ca-certificates