marvin/schnittfest
1
0
Fork 0
mirror of https://github.com/Kugelschieber/schnittfest.git synced 2026-01-18 10:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed dockerfile and added suppport for subdomains for certmagic.

Browse Source
This commit is contained in:
Marvin Blum
2019-12-26 15:33:08 +01:00
parent 8132e85b6b
commit 5cfa077186
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@@ -27,10 +27,11 @@ RUN apk update && \
COPY --from=build /app /app COPY --from=build /app /app
WORKDIR /app WORKDIR /app
RUN addgroup -S appuser && \ # use root to bind port 80 and 443
adduser -S -G appuser appuser && \ #RUN addgroup -S appuser && \
chown -R appuser:appuser /app # adduser -S -G appuser appuser && \
USER appuser # chown -R appuser:appuser /app
#USER appuser
# default config # default config
ENV SCHNITTFEST_HOST=0.0.0.0:80 ENV SCHNITTFEST_HOST=0.0.0.0:80
@@ -38,6 +39,7 @@ ENV SCHNITTFEST_LOGLEVEL=info
ENV SCHNITTFEST_ALLOWED_ORIGINS=* ENV SCHNITTFEST_ALLOWED_ORIGINS=*
ENV SCHNITTFEST_HTTP_WRITE_TIMEOUT=5 ENV SCHNITTFEST_HTTP_WRITE_TIMEOUT=5
ENV SCHNITTFEST_HTTP_READ_TIMEOUT=5 ENV SCHNITTFEST_HTTP_READ_TIMEOUT=5
ENV SCHNITTFEST_DOMAIN_NAME=schnittfest.gmbh,www.schnittfest.gmbh
# run # run
EXPOSE 80 EXPOSE 80

3
main.go
View File

@@ -78,7 +78,6 @@ func configureCors(router *mux.Router) http.Handler {
func start(handler http.Handler) { func start(handler http.Handler) {
logbuch.Info("Starting server...") logbuch.Info("Starting server...")
writeTimeout := defaultHttpWriteTimeout writeTimeout := defaultHttpWriteTimeout
readTimeout := defaultHttpReadTimeout readTimeout := defaultHttpReadTimeout
var err error var err error
@@ -110,7 +109,7 @@ func start(handler http.Handler) {
if strings.ToLower(os.Getenv("SCHNITTFEST_TLS_ENABLE")) == "true" { if strings.ToLower(os.Getenv("SCHNITTFEST_TLS_ENABLE")) == "true" {
logbuch.Info("TLS enabled") 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 { } else {
logbuch.Fatal("Error starting server", server.ListenAndServe()) logbuch.Fatal("Error starting server", server.ListenAndServe())
} }