diff --git a/apps/manacore/apps/web/Dockerfile b/apps/manacore/apps/web/Dockerfile index 2e04bf2cb..d34f48ab5 100644 --- a/apps/manacore/apps/web/Dockerfile +++ b/apps/manacore/apps/web/Dockerfile @@ -14,10 +14,15 @@ COPY apps/manacore/apps/web ./apps/manacore/apps/web COPY apps/calc/packages/shared ./apps/calc/packages/shared COPY apps/clock/packages/shared ./apps/clock/packages/shared COPY apps/zitare/packages/content ./apps/zitare/packages/content +COPY packages/shared-uload ./packages/shared-uload RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store \ pnpm install --no-frozen-lockfile --ignore-scripts +# Build dependencies that need compilation +WORKDIR /app/apps/zitare/packages/content +RUN pnpm build + WORKDIR /app/apps/manacore/apps/web RUN pnpm exec svelte-kit sync RUN NODE_OPTIONS="--max-old-space-size=4096" pnpm build diff --git a/docker-compose.macmini.yml b/docker-compose.macmini.yml index e1fc84af1..628148e54 100644 --- a/docker-compose.macmini.yml +++ b/docker-compose.macmini.yml @@ -620,7 +620,7 @@ services: ports: - "3011:3011" healthcheck: - test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3011/health"] + test: ["CMD", "bun", "-e", "fetch('http://127.0.0.1:3011/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"] interval: 120s timeout: 10s retries: 3 @@ -1083,7 +1083,7 @@ services: ports: - "3025:3025" healthcheck: - test: ["CMD", "python", "-c", "import httpx; httpx.get('http://localhost:3025/health').raise_for_status()"] + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:3025/health')"] interval: 120s timeout: 10s retries: 3