From 57665c4ec4391e90b0f87344e039b0fd6a5f492e Mon Sep 17 00:00:00 2001 From: Mark Adkins Date: Sun, 22 Nov 2020 17:53:04 -0500 Subject: [PATCH] JRE Dependency Fix + Port Configuration --- Dockerfile | 2 +- docker-compose.yml | 2 ++ src/main.go | 12 +++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 31b777f..9af1089 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ COPY src/go.sum /tmp/signal-cli-rest-api-src/ RUN cd /tmp/signal-cli-rest-api-src && swag init && go build # Start a fresh container for release container -FROM adoptopenjdk:11-jre-hotspot +FROM adoptopenjdk:11-jdk-hotspot-bionic COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/signal-cli-rest-api /usr/bin/signal-cli-rest-api COPY --from=buildcontainer /tmp/signal-cli /opt/signal-cli diff --git a/docker-compose.yml b/docker-compose.yml index 3912db5..03e7af2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,8 @@ version: "3" services: signal-cli-rest-api: build: "." + environment: + - PORT=8080 ports: - "8080:8080" #map docker port 8080 to host port 8080. volumes: diff --git a/src/main.go b/src/main.go index 6309f8f..0f4b494 100644 --- a/src/main.go +++ b/src/main.go @@ -2,6 +2,7 @@ package main import ( "flag" + "os" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" @@ -85,8 +86,17 @@ func main() { } } - swaggerUrl := ginSwagger.URL("http://127.0.0.1:8080/swagger/doc.json") + swaggerPort := getEnv("PORT", "8080") + + swaggerUrl := ginSwagger.URL("http://127.0.0.1:" + string(swaggerPort) + "/swagger/doc.json") router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler, swaggerUrl)) router.Run() } + +func getEnv(key string, defaultVal string) string { + if value, exists := os.LookupEnv(key); exists { + return value + } + return defaultVal +}