diff --git a/Dockerfile b/Dockerfile index 897b854b..d89e3aed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,7 @@ WORKDIR /app COPY package.json . # Bun stage -FROM oven/bun:1 AS bun-builder -USER bun +FROM oven/bun:1.2.9-alpine AS bun-builder WORKDIR /app COPY --from=base /app/package.json . COPY . . @@ -20,15 +19,6 @@ COPY . . 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/build /app/build -COPY --from=bun-builder /app/node_modules /app/node_modules -EXPOSE 3000 -USER bun -CMD ["bun", "build/index.js"] - # Final Node.js image FROM node:20-alpine AS node USER node @@ -37,4 +27,13 @@ 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", "build/index.js"] \ No newline at end of file +CMD ["node", "build/index.js"] + +# Final Bun image +FROM oven/bun:1.2.9-alpine AS bun +WORKDIR /app +COPY --from=bun-builder /app/build /app/build +COPY --from=bun-builder /app/node_modules /app/node_modules +EXPOSE 3000 +USER bun +CMD ["bun", "build/index.js"] \ No newline at end of file diff --git a/package.json b/package.json index d32d76a5..0ae1d381 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,6 @@ "name": "photon-lemmy", "version": "2.0.0", "devDependencies": { - "@catdadcode/svelte-adapter-bun": "^0.5.7", "@dicebear/core": "^8.0.1", "@dicebear/initials": "^8.0.1", "@svelte-put/qr": "^2.0.0", @@ -26,6 +25,7 @@ "prettier-plugin-svelte": "^3.2.7", "rollup-plugin-visualizer": "^5.9.2", "svelte": "^5.19.7", + "svelte-adapter-bun-next": "^1.0.3", "svelte-check": "^4.0.0", "svelte-floating-ui": "^1.5.9", "svelte-focus-trap": "^1.2.0", diff --git a/svelte.config.js b/svelte.config.js index ab32a3dd..1bec4348 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,5 +1,5 @@ import node from '@sveltejs/adapter-node' -import bun from '@catdadcode/svelte-adapter-bun' +import bun from 'svelte-adapter-bun-next' import auto from '@sveltejs/adapter-auto' import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' @@ -17,10 +17,14 @@ const config = { process.env.ADAPTER == 'node' ? node() : process.env.ADAPTER == 'bun' - ? bun({ - precompress: true, - }) - : auto(), + ? bun({ + out: 'build', + precompress: { + brotli: true, + gzip: true, + }, + }) + : auto(), // csp: { // directives: { // 'script-src': ['self'],