feat: add support for node docker images
This commit is contained in:
1 parent
95676518dd
commit
0cce117531
8 files changed
+24
-35
No files matched your search
+16
-10
@@ -1,34 +1,40 @@
|
|||||||
# Base stage for both Bun and Node.js
|
# Base stage for both Bun and Node.js
|
||||||
FROM alpine:3.14 as base
|
FROM alpine:3.14 AS base
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY package.json .
|
COPY package.json .
|
||||||
|
|
||||||
# Bun stage
|
# Bun stage
|
||||||
FROM oven/bun:1 as bun-builder
|
FROM oven/bun:1 AS bun-builder
|
||||||
|
USER bun
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=base /app/package.json .
|
COPY --from=base /app/package.json .
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN bun install
|
RUN bun install
|
||||||
RUN bun run build
|
RUN ADAPTER=bun bun run build
|
||||||
|
|
||||||
# Node.js stage
|
# Node.js stage
|
||||||
FROM node:18-alpine as node-builder
|
FROM node:20-alpine AS node-builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=base /app/package.json .
|
COPY --from=base /app/package.json .
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN npm install
|
RUN npm install --no-lockfile
|
||||||
RUN npm run build
|
RUN ADAPTER=node npm run build
|
||||||
|
|
||||||
# Final Bun image
|
# Final Bun image
|
||||||
FROM oven/bun:1-alpine AS bun
|
FROM oven/bun:1-alpine AS bun
|
||||||
WORKDIR /app
|
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
|
EXPOSE 3000
|
||||||
CMD ["bun", "/app/build/index.js"]
|
USER bun
|
||||||
|
CMD ["bun", "build/index.js"]
|
||||||
|
|
||||||
# Final Node.js image
|
# Final Node.js image
|
||||||
FROM node:20-alpine AS node
|
FROM node:20-alpine AS node
|
||||||
|
USER node
|
||||||
WORKDIR /app
|
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
|
EXPOSE 3000
|
||||||
CMD ["node", "/app/build/index.js"]
|
CMD ["node", "build/index.js"]
|
||||||
@@ -17,6 +17,7 @@
|
|||||||
"jsdom": "^22.1.0",
|
"jsdom": "^22.1.0",
|
||||||
"lemmy-js-client": "latest",
|
"lemmy-js-client": "latest",
|
||||||
"linkify-it": "^5.0.0",
|
"linkify-it": "^5.0.0",
|
||||||
|
"marked": "^5.1.2",
|
||||||
"marked-linkify-it": "^3.1.10",
|
"marked-linkify-it": "^3.1.10",
|
||||||
"mono-svelte": "^1.5.14",
|
"mono-svelte": "^1.5.14",
|
||||||
"nprogress": "^0.2.0",
|
"nprogress": "^0.2.0",
|
||||||
|
|||||||
@@ -1,17 +1,14 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/stores'
|
import { page } from '$app/stores'
|
||||||
import { site } from '$lib/lemmy.js'
|
|
||||||
import { userSettings } from '$lib/settings'
|
import { userSettings } from '$lib/settings'
|
||||||
import { t } from '$lib/translations'
|
import { t } from '$lib/translations'
|
||||||
import { searchParam } from '$lib/util.js'
|
import { searchParam } from '$lib/util.js'
|
||||||
import { feature } from '$lib/version.js'
|
|
||||||
import type { SortType } from 'lemmy-js-client'
|
import type { SortType } from 'lemmy-js-client'
|
||||||
import { Select } from 'mono-svelte'
|
import { Select } from 'mono-svelte'
|
||||||
import {
|
import {
|
||||||
ArrowTrendingDown,
|
ArrowTrendingDown,
|
||||||
ArrowTrendingUp,
|
ArrowTrendingUp,
|
||||||
Calendar,
|
Calendar,
|
||||||
CalendarDateRange,
|
|
||||||
CalendarDays,
|
CalendarDays,
|
||||||
ChartBar,
|
ChartBar,
|
||||||
ChatBubbleLeftRight,
|
ChatBubbleLeftRight,
|
||||||
@@ -198,7 +195,7 @@
|
|||||||
</option>
|
</option>
|
||||||
<option value="TopWeek">
|
<option value="TopWeek">
|
||||||
<Icon
|
<Icon
|
||||||
src={CalendarDateRange}
|
src={CalendarDays}
|
||||||
size="16"
|
size="16"
|
||||||
mini
|
mini
|
||||||
class="text-slate-600 dark:text-zinc-400"
|
class="text-slate-600 dark:text-zinc-400"
|
||||||
|
|||||||
@@ -25,8 +25,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$: data = extractTitle(raw)
|
$: data = extractTitle(raw)
|
||||||
|
|
||||||
$: console.log(data.content)
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<Expandable class="border-y border-slate-200 dark:border-zinc-800 py-2">
|
<Expandable class="border-y border-slate-200 dark:border-zinc-800 py-2">
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { notifications, profile, profileData } from '$lib/auth.js'
|
import { notifications, profile } from '$lib/auth.js'
|
||||||
import Link from '$lib/components/input/Link.svelte'
|
|
||||||
import ShieldIcon from '$lib/components/lemmy/moderation/ShieldIcon.svelte'
|
import ShieldIcon from '$lib/components/lemmy/moderation/ShieldIcon.svelte'
|
||||||
import {
|
import {
|
||||||
amModOfAny,
|
amModOfAny,
|
||||||
@@ -29,14 +28,11 @@
|
|||||||
} from 'svelte-hero-icons'
|
} from 'svelte-hero-icons'
|
||||||
import Profile from './Profile.svelte'
|
import Profile from './Profile.svelte'
|
||||||
import NavButton from './NavButton.svelte'
|
import NavButton from './NavButton.svelte'
|
||||||
import { fly, scale } from 'svelte/transition'
|
import { scale } from 'svelte/transition'
|
||||||
import { expoOut, backOut } from 'svelte/easing'
|
import { backOut } from 'svelte/easing'
|
||||||
import { flip } from 'svelte/animate'
|
|
||||||
import SearchBar from '$lib/components/lemmy/util/SearchBar.svelte'
|
import SearchBar from '$lib/components/lemmy/util/SearchBar.svelte'
|
||||||
import { swipeGesture } from '$lib/input/swipe'
|
|
||||||
import Logo from '../Logo.svelte'
|
import Logo from '../Logo.svelte'
|
||||||
import { LINKED_INSTANCE_URL } from '$lib/instance'
|
import { LINKED_INSTANCE_URL } from '$lib/instance'
|
||||||
import SiteCard from '$lib/components/lemmy/SiteCard.svelte'
|
|
||||||
import { t } from '$lib/translations'
|
import { t } from '$lib/translations'
|
||||||
import CommandsWrapper from './commands/CommandsWrapper.svelte'
|
import CommandsWrapper from './commands/CommandsWrapper.svelte'
|
||||||
|
|
||||||
|
|||||||
@@ -90,7 +90,6 @@
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
$: title = routes[($page.route.id as keyof typeof routes) ?? '']
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<svelte:head>
|
<svelte:head>
|
||||||
@@ -149,14 +148,7 @@
|
|||||||
>
|
>
|
||||||
<slot />
|
<slot />
|
||||||
</main>
|
</main>
|
||||||
<Navbar
|
<Navbar slot="navbar" let:style={s} let:class={c} class={c} style={s} />
|
||||||
slot="navbar"
|
|
||||||
let:style={s}
|
|
||||||
let:class={c}
|
|
||||||
class={c}
|
|
||||||
style={s}
|
|
||||||
{title}
|
|
||||||
/>
|
|
||||||
<div slot="suffix" let:class={c} let:style={s} class={c} style={s}>
|
<div slot="suffix" let:class={c} let:style={s} class={c} style={s}>
|
||||||
{#if $page.data.slots?.sidebar?.component}
|
{#if $page.data.slots?.sidebar?.component}
|
||||||
<svelte:component
|
<svelte:component
|
||||||
|
|||||||
+2
-3
@@ -1,9 +1,8 @@
|
|||||||
import { sveltekit } from '@sveltejs/kit/vite'
|
import { sveltekit } from '@sveltejs/kit/vite'
|
||||||
import { defineConfig, type PluginOption } from 'vite'
|
import { defineConfig } from 'vite'
|
||||||
import { visualizer } from 'rollup-plugin-visualizer'
|
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [sveltekit(), visualizer({}) as PluginOption],
|
plugins: [sveltekit()],
|
||||||
|
|
||||||
define: {
|
define: {
|
||||||
__VERSION__: JSON.stringify(process.env.npm_package_version),
|
__VERSION__: JSON.stringify(process.env.npm_package_version),
|
||||||
|
|||||||
Reference in new issue
Block a user