From ad85c15af3891135559097cff03da3baf6133b97 Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <mail@manuelkieweg.de>
Date: Mon, 19 Oct 2020 15:13:15 +0100
Subject: [PATCH] Port ind Dockerfile and listening address for controller
changed
---
Dockerfile | 6 ++++--
cmd/gosdn/main.go | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index f7e594ad6..4e90a5a77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,18 @@
-FROM golang:alpine AS builder
+FROM golang:1.15-alpine AS builder
ARG GITLAB_USER
ARG GITLAB_TOKEN
WORKDIR /src/gosdn
COPY . .
+RUN apk add git
RUN git config --global url."https://$GITLAB_USER:$GITLAB_TOKEN@code.fbi.h-da.de".insteadOf "https://code.fbi.h-da.de"
RUN go mod download
RUN CGO_ENABLED=0 GOOS=linux go build ./cmd/gosdn
FROM alpine:latest
EXPOSE 8443
+EXPOSE 55055
COPY --from=builder /src/gosdn/gosdn .
-COPY --from=builder /src/gosdn/config .
+COPY --from=builder /src/gosdn/configs ./configs
ENTRYPOINT [ "./gosdn" ]
CMD [""]
diff --git a/cmd/gosdn/main.go b/cmd/gosdn/main.go
index 7527c7d3e..0f3e798ba 100644
--- a/cmd/gosdn/main.go
+++ b/cmd/gosdn/main.go
@@ -9,7 +9,7 @@ import (
func main() {
// register our supported flags
- cliListenAddr := flag.String("cli-listen-addr", "localhost", "The IP address of the grpcCLI.")
+ cliListenAddr := flag.String("cli-listen-addr", "", "The IP address of the grpcCLI.")
cliListenPort := flag.String("cli-server-port", "55055", "The port number of the grpcCLI")
configFileName := flag.String("config-file", "", "Path to the config file")
--
GitLab