From 83d1af3cfbfe4070e5004596865c0b7015f79eff Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 15 Sep 2023 20:20:57 +0200
Subject: Steamline docker build

---
 Dockerfile   | 7 +++++--
 src/index.ts | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4fc6b54..4261ce2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,9 @@ RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/a
 RUN apk add --no-cache prettier@testing make fd brotli gzip zstd
 
 COPY --link Makefile ./
-COPY --from=ssg /web ./
+COPY --from=ssg /web/config.toml ./
+COPY --from=ssg /web/content content
+COPY --from=ssg /web/public public
 
 RUN make -j4 format compress
 
@@ -56,8 +58,9 @@ RUN make -j4 format compress
 FROM base
 
 # Copy built application
+COPY config.toml /app/
 COPY --from=build /app /app
-COPY --from=postprocess /web/ /app/website
+COPY --from=postprocess /web/public /app/public
 
 # Start the server by default, this can be overwritten at runtime
 EXPOSE 3000
diff --git a/src/index.ts b/src/index.ts
index ee092f2..3ddbce3 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -8,8 +8,8 @@ import readConfig from "./config";
 
 Sentry.init({});
 
-const base = "./website/";
-const publicDir = path.resolve(base, "public") + path.sep;
+const base = ".";
+const publicDir = path.resolve(base, "website") + path.sep;
 
 const config = readConfig(base);
 const defaultHeaders = {
-- 
cgit 1.4.1