Fix/pull from harbor (#5521)

farbanas · web-flow · commit b709d3ba0b83 · 2025-02-28T14:01:33.000+01:00
* fix: pull from harbor instead of dockerhub

* add remaining

* add comments saying that these changes will only work with VPN
diff --git 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
@@ -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
@@ -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
@@ -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" ]
+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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:22.04`
	`1`	`+FROM harbor.nymte.ch/dockerhub/ubuntu:22.04`
`2`	`2`
`3`	`3`	`RUN apt-get update && apt-get install -y ca-certificates`
`4`	`4`