From ec708a772341ebcae3e452628f60c2a9dab2dee1 Mon Sep 17 00:00:00 2001
From: Lilleman <lilleman@larvit.se>
Date: Tue, 19 Apr 2022 16:56:09 +0200
Subject: [PATCH] Fixed issues with public files

---
 Dockerfile                      | 5 ++++-
 docker-compose.yml              | 7 ++++++-
 {src/public => public}/main.css | 0
 src/main.go                     | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)
 rename {src/public => public}/main.css (100%)

diff --git a/Dockerfile b/Dockerfile
index a566950..21c1cfc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.7-alpine3.15 AS builder
+FROM golang:1.18.1-alpine3.15 AS builder
 
 # Install missing pkgs
 RUN apk add --no-cache git
@@ -34,5 +34,8 @@ FROM scratch
 
 COPY --from=builder /dist/main /
 
+# Copy public files
+COPY ./public /public
+
 # Command to run
 ENTRYPOINT ["/main"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 32bbb60..13dac74 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,5 +33,10 @@ services:
     build: .
     depends_on:
       - auth-api
+    environment:
+      - ADMIN_API_KEY=hihi
+      - API_URL=http://auth-api:4000
+      - JWT_SHARED_SECRET=hihi
+      - PORT=4001
     ports:
-      - 8080:80
\ No newline at end of file
+      - 4001:4001
\ No newline at end of file
diff --git a/src/public/main.css b/public/main.css
similarity index 100%
rename from src/public/main.css
rename to public/main.css
diff --git a/src/main.go b/src/main.go
index ae3338c..3ed22df 100644
--- a/src/main.go
+++ b/src/main.go
@@ -47,7 +47,7 @@ func main() {
 	app.Use(handlers.LogReq)
 
 	// Static files
-	app.Static("/", "./src/public")
+	app.Static("/", "./public")
 
 	// Unpack user token, refresh token when needed etc.
 	app.Use(handlers.HandleCookieTokens)
@@ -70,5 +70,5 @@ func main() {
 		err = app.Listen(webBindHost)
 	}
 
-	log.Info("Webb server closed, shutting down")
+	log.Info("Web server closed, shutting down")
 }