diff options
| author | Joe Carstairs <me@joeac.net> | 2025-12-18 16:29:06 +0000 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2025-12-18 16:29:06 +0000 |
| commit | 9c50e749048f8e1c918d1abf2ca9713410f28816 (patch) | |
| tree | bca23942e94e519f76201d98027c9745496cd6ad | |
| parent | b0be9fae2f062524f6a37fc1c1206701fdef08c7 (diff) | |
Move website root to website/
| -rw-r--r-- | .dockerignore | 8 | ||||
| -rw-r--r-- | website/.dockerignore | 7 | ||||
| -rw-r--r-- | website/Dockerfile (renamed from Dockerfile) | 18 | ||||
| -rw-r--r-- | website/package-lock.json (renamed from package-lock.json) | 0 | ||||
| -rw-r--r-- | website/package.json (renamed from package.json) | 10 |
5 files changed, 21 insertions, 22 deletions
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 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 index 64762d1..64762d1 100644 --- a/package-lock.json +++ b/website/package-lock.json diff --git a/package.json b/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" |