From 9c50e749048f8e1c918d1abf2ca9713410f28816 Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Thu, 18 Dec 2025 16:29:06 +0000
Subject: [PATCH] Move website root to website/

---
 .dockerignore                                  |  8 --------
 website/.dockerignore                          |  7 +++++++
 Dockerfile => website/Dockerfile               | 18 +++++++++---------
 package-lock.json => website/package-lock.json |  0
 package.json => website/package.json           | 10 +++++-----
 5 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 .dockerignore
 create mode 100644 website/.dockerignore
 rename Dockerfile => website/Dockerfile (79%)
 rename package-lock.json => website/package-lock.json (100%)
 rename package.json => website/package.json (66%)

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 72dfeea..0000000
--- a/.dockerignore
+++ /dev/null
@@ -1,8 +0,0 @@
-!package-*.json
-node_modules/
-dist/
-.helix/
-.vscode/
-.zed/
-.env
-*.sqlite
diff --git a/website/.dockerignore b/website/.dockerignore
new file mode 100644
index 0000000..6966f08
--- /dev/null
+++ b/website/.dockerignore
@@ -0,0 +1,7 @@
+.astro/
+dist/
+node_modules/
+.dockerignore
+.env
+*.sqlite
+Dockerfile
diff --git a/Dockerfile b/website/Dockerfile
similarity index 79%
rename from Dockerfile
rename to website/Dockerfile
index e3eeaed..3984228 100644
--- a/Dockerfile
+++ b/website/Dockerfile
@@ -14,26 +14,26 @@ WORKDIR /app
 #   from your very own no-reply email address?
 ############################################
 
-COPY package.json .
-COPY website/db website/astro.config.mjs website/
+COPY package.json package-lock.json ./
+RUN npm install
+
+COPY astro.config.mjs ./
+COPY db ./db/
 ARG DB_URL=file:/app/db.sqlite
 ENV ASTRO_DB_REMOTE_URL=$DB_URL
 RUN mkdir -p "$(dirname "$(echo "$ASTRO_DB_REMOTE_URL" | cut -d':' -f 2)")"
 RUN npm run astro db push
 
-COPY ./website ./website
-RUN npm install
+COPY . .
 RUN npm run build
 
 ARG MAX_DAILY_EMAILS="100"
+ENV MAX_DAILY_EMAILS=$MAX_DAILY_EMAILS
 ARG SENDMAIL_BIN="/usr/sbin/sendmail"
+ENV SENDMAIL_BIN=$SENDMAIL_BIN
 
 ENV HOST=0.0.0.0
 ENV PORT=4321
 
 EXPOSE 4321
-CMD [ \
-  "MAX_DAILY_EMAILS=$MAX_DAILY_EMAILS", \
-  "SENDMAIL_BIN=$SENDMAIL_BIN", \
-  "node", \
-  "./website/dist/server/entry.mjs"]
+CMD ["node", "./dist/server/entry.mjs"]
diff --git a/package-lock.json b/website/package-lock.json
similarity index 100%
rename from package-lock.json
rename to website/package-lock.json
diff --git a/package.json b/website/package.json
similarity index 66%
rename from package.json
rename to website/package.json
index 8020ef5..a0a647c 100644
--- a/package.json
+++ b/website/package.json
@@ -1,11 +1,11 @@
 {
   "private": "true",
   "scripts": {
-    "dev": "cd website && astro dev",
-    "start": "cd website && astro build --remote && node ./dist/server/entry.mjs",
-    "build": "cd website && astro build --remote",
-    "preview": "cd website && astro preview",
-    "astro": "cd website && astro"
+    "dev": "astro dev",
+    "start": "astro build --remote && node ./dist/server/entry.mjs",
+    "build": "astro build --remote",
+    "preview": "astro preview",
+    "astro": "astro"
   },
   "engines": {
     "node": "^22.14.0"