Skip to content

Commit b92263e

Browse files
check again
1 parent e351758 commit b92263e

7 files changed

Lines changed: 20 additions & 31 deletions

File tree

.github/scripts/resolve-release-installers.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ set -euo pipefail
55
REPO="${1:?owner/repo}"
66
TAG="${2:?tag name e.g. v0.1.0}"
77

8-
NAMES=$(gh api "repos/${REPO}/releases/tags/${TAG}" --jq -r '.assets[].name')
8+
# gh api --jq only accepts one expression; do not pass jq's -r there ("accepts 1 arg(s), received 2").
9+
NAMES=$(gh api "repos/${REPO}/releases/tags/${TAG}" | jq -r '.assets // [] | .[] | .name')
910

1011
pick_dmg() {
1112
local line

website/.dockerignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
node_modules
2-
dist
32
.git
4-
*.md
53
.env
64
.env.*
5+
# Do NOT ignore *.md — VitePress sources (index.md, manual.md, compare.md) must be in the build context.

website/Caddyfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Static VitePress output: extensionless URLs (/manual) → manual.html
2+
:80 {
3+
root * /srv
4+
encode gzip
5+
6+
handle {
7+
try_files {path} {path}/ {path}.html /index.html
8+
file_server
9+
}
10+
}

website/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# VitePress static site — nginx serves `.vitepress/dist`
1+
# Build VitePress → serve static files with Caddy (no separate nginx layer).
22
FROM node:22-alpine AS build
33
WORKDIR /app
44

@@ -14,7 +14,6 @@ ARG VITE_ASSET_MAC_DMG=
1414
ARG VITE_ASSET_WIN=
1515
ARG VITE_ASSET_LINUX_APPIMAGE=
1616

17-
# Markdown links still use a placeholder repo URL; rewrite when building for your fork.
1817
RUN if [ -n "$VITE_GITHUB_REPO" ]; then \
1918
for f in index.md compare.md; do \
2019
if [ -f "$f" ]; then \
@@ -32,7 +31,7 @@ ENV VITE_ASSET_LINUX_APPIMAGE=$VITE_ASSET_LINUX_APPIMAGE
3231

3332
RUN npm run build
3433

35-
FROM nginx:1.27-alpine
36-
COPY nginx.conf /etc/nginx/conf.d/default.conf
37-
COPY --from=build /app/.vitepress/dist /usr/share/nginx/html
34+
FROM caddy:2-alpine
35+
COPY Caddyfile /etc/caddy/Caddyfile
36+
COPY --from=build /app/.vitepress/dist /srv
3837
EXPOSE 80

website/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ If assets are not set (local build), buttons fall back to the latest releases pa
3838

3939
## Docker
4040

41-
Build context is the `website/` folder. The image runs `vitepress build` and serves `.vitepress/dist` with nginx.
41+
Build context is the `website/` folder. **VitePress only produces static files** (`html`, `js`, `css`); the image still needs a tiny web server to answer HTTP. The final stage uses **[Caddy](https://caddyserver.com/)** (~50MB) with a short `Caddyfile` (`try_files` for extensionless URLs like `/manual``manual.html`), not nginx.
4242

4343
```bash
4444
docker build \

website/im-docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Same as docker-compose.yaml — alternate filename for quick server deploys.
22
services:
33
aerosol-www:
4-
image: ${DOCKERHUB_USER:-yourdockerhub}/aerosol-website:latest
4+
image: shivanshtalwar0/aerosol-website:latest
55
ports:
6-
- "${WEB_PORT:-8080}:80"
6+
- "${WEB_PORT:-3131}:80"
77
restart: unless-stopped

website/nginx.conf

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)