diff --git a/.gitlab/ci/.build-binaries.yml b/.gitlab/ci/.build-binaries.yml index d9501f5320566d747f44089cb0e1fcf31ef930ae..25d738ff406470847955eaf8330ed5d6260ec496 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 4eece74d6d3ee33e0f0cc9cb0e71d00e8078f84a..706555b00f69a8c7d9e53c435ad0d516bc03570e 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 b84e82c38ef9b9ac84d5c597011422e94f2e5754..593b70655eacf06220e05c8b5d228ddb853c661f 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 /