From a822bbfaee56aa28052f7beaf3125d2b99ff7baf Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil.schark@h-da.de>
Date: Mon, 11 Dec 2023 14:55:48 +0000
Subject: [PATCH] Add missing proxy to dockerfiles
See merge request danet/gosdn!655
---
.gitlab/ci/.build-binaries.yml | 1 -
applications/venv-manager/venv-manager.Dockerfile | 4 ++--
cli/cli.Dockerfile | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab/ci/.build-binaries.yml b/.gitlab/ci/.build-binaries.yml
index d9501f532..25d738ff4 100644
--- a/.gitlab/ci/.build-binaries.yml
+++ b/.gitlab/ci/.build-binaries.yml
@@ -15,5 +15,4 @@ build-all-binaries:
- artifacts/orchestrator
- artifacts/venv-manager
expire_in: 1 week
-
<<: *build-binaries
diff --git a/applications/venv-manager/venv-manager.Dockerfile b/applications/venv-manager/venv-manager.Dockerfile
index 4eece74d6..706555b00 100644
--- a/applications/venv-manager/venv-manager.Dockerfile
+++ b/applications/venv-manager/venv-manager.Dockerfile
@@ -1,6 +1,6 @@
ARG GOLANG_VERSION=1.21
ARG BUILDARGS
-ARG GITLAB_PROXY=code.fbi.h-da.de:443/danet/dependency_proxy/containers
+ARG GITLAB_PROXY
FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm AS builder
@@ -17,7 +17,7 @@ COPY applications/venv-manager/ applications/venv-manager/
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o venv-manager applications/venv-manager/main.go
-FROM ubuntu:22.04
+FROM ${GITLAB_PROXY}ubuntu:22.04
COPY --from=builder /gosdn/venv-manager /venv-manager
ENTRYPOINT ["/venv-manager"]
diff --git a/cli/cli.Dockerfile b/cli/cli.Dockerfile
index b84e82c38..593b70655 100644
--- a/cli/cli.Dockerfile
+++ b/cli/cli.Dockerfile
@@ -1,6 +1,6 @@
ARG GOLANG_VERSION=1.21
ARG BUILDARGS
-ARG $GITLAB_PROXY
+ARG GITLAB_PROXY
FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-alpine AS builder
WORKDIR /gosdn/
@@ -10,5 +10,5 @@ RUN --mount=type=cache,target=/root/go/pkg/mod \
--mount=type=cache,target=/root/.cache/go-build \
make build-gosdnc
-FROM ubuntu:22.04
+FROM ${GITLAB_PROXY}ubuntu:22.04
COPY --from=builder /gosdn/artifacts/gosdnc /
--
GitLab