Skip to content
Snippets Groups Projects
Commit a822bbfa authored by Neil-Jocelyn Schark's avatar Neil-Jocelyn Schark Committed by Malte Bauch
Browse files

Add missing proxy to dockerfiles

See merge request !655
parent b04ce1d9
No related branches found
No related tags found
1 merge request!655Add missing proxy to dockerfiles
Pipeline #175060 passed
...@@ -15,5 +15,4 @@ build-all-binaries: ...@@ -15,5 +15,4 @@ build-all-binaries:
- artifacts/orchestrator - artifacts/orchestrator
- artifacts/venv-manager - artifacts/venv-manager
expire_in: 1 week expire_in: 1 week
<<: *build-binaries <<: *build-binaries
ARG GOLANG_VERSION=1.21 ARG GOLANG_VERSION=1.21
ARG BUILDARGS 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 FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-bookworm AS builder
...@@ -17,7 +17,7 @@ COPY applications/venv-manager/ applications/venv-manager/ ...@@ -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 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 COPY --from=builder /gosdn/venv-manager /venv-manager
ENTRYPOINT ["/venv-manager"] ENTRYPOINT ["/venv-manager"]
ARG GOLANG_VERSION=1.21 ARG GOLANG_VERSION=1.21
ARG BUILDARGS ARG BUILDARGS
ARG $GITLAB_PROXY ARG GITLAB_PROXY
FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-alpine AS builder FROM ${GITLAB_PROXY}golang:$GOLANG_VERSION-alpine AS builder
WORKDIR /gosdn/ WORKDIR /gosdn/
...@@ -10,5 +10,5 @@ RUN --mount=type=cache,target=/root/go/pkg/mod \ ...@@ -10,5 +10,5 @@ RUN --mount=type=cache,target=/root/go/pkg/mod \
--mount=type=cache,target=/root/.cache/go-build \ --mount=type=cache,target=/root/.cache/go-build \
make build-gosdnc make build-gosdnc
FROM ubuntu:22.04 FROM ${GITLAB_PROXY}ubuntu:22.04
COPY --from=builder /gosdn/artifacts/gosdnc / COPY --from=builder /gosdn/artifacts/gosdnc /
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment