From 0cce117531b3b80894f3a828df340862c8b147bc Mon Sep 17 00:00:00 2001 From: Xylight Date: Fri, 2 Aug 2024 15:43:11 -0700 Subject: [PATCH] feat: add support for node docker images --- Dockerfile | 26 +++++++++++------- bun.lockb | Bin 173164 -> 173521 bytes package.json | 1 + .../components/lemmy/dropdowns/Sort.svelte | 5 +--- .../markdown/renderers/MdSpoiler.svelte | 2 -- src/lib/components/ui/navbar/Navbar.svelte | 10 ++----- src/routes/+layout.svelte | 10 +------ vite.config.ts | 5 ++-- 8 files changed, 24 insertions(+), 35 deletions(-) diff --git a/Dockerfile b/Dockerfile index 17e4c109..897b854b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,34 +1,40 @@ # Base stage for both Bun and Node.js -FROM alpine:3.14 as base +FROM alpine:3.14 AS base WORKDIR /app COPY package.json . # Bun stage -FROM oven/bun:1 as bun-builder +FROM oven/bun:1 AS bun-builder +USER bun WORKDIR /app COPY --from=base /app/package.json . COPY . . RUN bun install -RUN bun run build +RUN ADAPTER=bun bun run build # Node.js stage -FROM node:18-alpine as node-builder +FROM node:20-alpine AS node-builder WORKDIR /app COPY --from=base /app/package.json . COPY . . -RUN npm install -RUN npm run build +RUN npm install --no-lockfile +RUN ADAPTER=node npm run build # Final Bun image FROM oven/bun:1-alpine AS bun WORKDIR /app -COPY --from=bun-builder /app . +COPY --from=bun-builder /app/build /app/build +COPY --from=bun-builder /app/node_modules /app/node_modules EXPOSE 3000 -CMD ["bun", "/app/build/index.js"] +USER bun +CMD ["bun", "build/index.js"] # Final Node.js image FROM node:20-alpine AS node +USER node WORKDIR /app -COPY --from=node-builder /app . +COPY --from=node-builder /app/build /app/build +COPY --from=node-builder /app/node_modules /app/node_modules +COPY --from=node-builder /app/package.json /app/package.json EXPOSE 3000 -CMD ["node", "/app/build/index.js"] \ No newline at end of file +CMD ["node", "build/index.js"] \ No newline at end of file diff --git a/bun.lockb b/bun.lockb index 466e8543ab06c21bc3448a00b0267cd8fbde5dc1..671aff545a555e4d6962b5fa296d5489d0c7369c 100755 GIT binary patch delta 15238 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 y>eO2^Khzg*54DO&d$xXPh*mgO{ARx9CSJrg@ delta 15325 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 I+QFFr0z;~vAOHXW diff --git a/package.json b/package.json index be088ab9..e3ab664e 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "jsdom": "^22.1.0", "lemmy-js-client": "latest", "linkify-it": "^5.0.0", + "marked": "^5.1.2", "marked-linkify-it": "^3.1.10", "mono-svelte": "^1.5.14", "nprogress": "^0.2.0", diff --git a/src/lib/components/lemmy/dropdowns/Sort.svelte b/src/lib/components/lemmy/dropdowns/Sort.svelte index c88a891f..5ab2149f 100644 --- a/src/lib/components/lemmy/dropdowns/Sort.svelte +++ b/src/lib/components/lemmy/dropdowns/Sort.svelte @@ -1,17 +1,14 @@ diff --git a/src/lib/components/ui/navbar/Navbar.svelte b/src/lib/components/ui/navbar/Navbar.svelte index efa18fcf..d125347e 100644 --- a/src/lib/components/ui/navbar/Navbar.svelte +++ b/src/lib/components/ui/navbar/Navbar.svelte @@ -1,6 +1,5 @@ @@ -149,14 +148,7 @@ > - +
{#if $page.data.slots?.sidebar?.component}