From d48f3f973775a75ca4cde1dcae84b7b1b91ae108 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 8 Sep 2018 16:43:37 +0200 Subject: [PATCH] fixed crashing when no config was found --- Dockerfile | 3 --- models/config.go | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d19830e49..8a8fa394fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,11 +33,8 @@ RUN apk --no-cache add \ su-exec \ tzdata - - COPY docker / COPY --from=build-env /go/src/code.vikunja.io/api/vikunja /app/vikunja/api -#RUN ln -s /app/vikunja/vikunja /usr/local/bin/vikunja ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"] CMD [] diff --git a/models/config.go b/models/config.go index 8f85379fd7..a6b0ba11de 100644 --- a/models/config.go +++ b/models/config.go @@ -42,7 +42,7 @@ func InitConfig() (err error) { fmt.Println("Using defaults.") } - return + return nil } func random(length int) (string, error) {