From 45d41d714b321f9bbc8e77d4d9dd3e50a731d345 Mon Sep 17 00:00:00 2001
From: Antonio De Lucreziis <antonio.delucreziis@gmail.com>
Date: Sun, 31 Jul 2022 00:31:34 +0200
Subject: [PATCH] Fixed dockerfile

---
 .dockerignore    | 3 +++
 Dockerfile       | 3 ++-
 config/config.go | 8 ++++++--
 main.go          | 7 ++++++-
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..2a25b49
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+Dockerfile
+node_modules
+.git
diff --git a/Dockerfile b/Dockerfile
index 2f318bb..4dc061e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,10 @@ RUN go build -buildvcs=false -o website-server -v .
 FROM alpine:latest AS runner
 WORKDIR /app
 COPY --from=frontend-builder /frontend/dist ./frontend/dist
-COPY --from=backend-builder / ./website-server
+COPY --from=backend-builder /backend/website-server ./website-server
 COPY ./views ./views
 COPY ./news ./news
 COPY ./public ./public
+COPY ./.env ./.env
 EXPOSE 8000
 CMD ["./website-server"]
diff --git a/config/config.go b/config/config.go
index 11ae1ab..462e6f8 100644
--- a/config/config.go
+++ b/config/config.go
@@ -27,16 +27,20 @@ func loadEnv(target *string, name, defaultValue string) {
 	} else {
 		*target = value
 	}
+
 	log.Printf("%s = %v", name, *target)
 }
 
 func Load() {
-	godotenv.Load()
+	if err := godotenv.Load(); err != nil {
+		panic(err)
+	}
+
 	log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile)
 
 	// Production
 	loadEnv(&Mode, "MODE", "production")
-	loadEnv(&Host, "HOST", "localhost:8080")
+	loadEnv(&Host, "HOST", ":8080")
 
 	// Services
 	loadEnv(&GitUrl, "GIT_URL", "https://git.example.org")
diff --git a/main.go b/main.go
index 606ffb3..78d66b9 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"html/template"
+	"log"
 	"time"
 
 	"git.phc.dm.unipi.it/phc/website/articles"
@@ -198,5 +199,9 @@ func main() {
 		})
 	})
 
-	app.Listen(config.Host)
+	log.Printf("Starting server on host %q", config.Host)
+	err := app.Listen(config.Host)
+	if err != nil {
+		log.Fatal(err)
+	}
 }