diff --git a/Dockerfile b/Dockerfile index c38a7fc..fa6d998 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,10 +27,11 @@ RUN apk update && \ COPY --from=build /app /app WORKDIR /app -RUN addgroup -S appuser && \ - adduser -S -G appuser appuser && \ - chown -R appuser:appuser /app -USER appuser +# use root to bind port 80 and 443 +#RUN addgroup -S appuser && \ +# adduser -S -G appuser appuser && \ +# chown -R appuser:appuser /app +#USER appuser # default config ENV SCHNITTFEST_HOST=0.0.0.0:80 @@ -38,6 +39,7 @@ ENV SCHNITTFEST_LOGLEVEL=info ENV SCHNITTFEST_ALLOWED_ORIGINS=* ENV SCHNITTFEST_HTTP_WRITE_TIMEOUT=5 ENV SCHNITTFEST_HTTP_READ_TIMEOUT=5 +ENV SCHNITTFEST_DOMAIN_NAME=schnittfest.gmbh,www.schnittfest.gmbh # run EXPOSE 80 diff --git a/main.go b/main.go index 1ba4762..6dc5d18 100644 --- a/main.go +++ b/main.go @@ -78,7 +78,6 @@ func configureCors(router *mux.Router) http.Handler { func start(handler http.Handler) { logbuch.Info("Starting server...") - writeTimeout := defaultHttpWriteTimeout readTimeout := defaultHttpReadTimeout var err error @@ -110,7 +109,7 @@ func start(handler http.Handler) { if strings.ToLower(os.Getenv("SCHNITTFEST_TLS_ENABLE")) == "true" { logbuch.Info("TLS enabled") - logbuch.Fatal("Error starting server", certmagic.HTTPS([]string{os.Getenv("SCHNITTFEST_DOMAIN_NAME")}, handler)) + logbuch.Fatal("Error starting server", certmagic.HTTPS(strings.Split(os.Getenv("SCHNITTFEST_DOMAIN_NAME"), ","), handler)) } else { logbuch.Fatal("Error starting server", server.ListenAndServe()) }