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 466e8543..671aff54 100755 Binary files a/bun.lockb and b/bun.lockb differ 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}