diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..ed095bd --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +node_modules +.nuxt +.output +dist +.git diff --git a/Dockerfile b/Dockerfile index 76dc6af..db8340a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:22-alpine AS base +FROM node:22-slim AS base RUN corepack enable FROM base AS deps @@ -7,6 +7,7 @@ COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./ RUN pnpm install --frozen-lockfile FROM base AS build +RUN apt-get update && apt-get install -y --no-install-recommends imagemagick && rm -rf /var/lib/apt/lists/* && ln -s /usr/bin/convert /usr/local/bin/magick WORKDIR /app COPY --from=deps /app/node_modules ./node_modules COPY . . diff --git a/docker-compose.yml b/docker-compose.yml index 9d85360..d14eb41 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,6 @@ services: app: + container_name: beta-pihkaal-me image: git.pihkaal.me/pihkaal/pihkaal-me:latest restart: unless-stopped networks: diff --git a/modules/asset-generator.ts b/modules/asset-generator.ts index 7463c91..36208b1 100644 --- a/modules/asset-generator.ts +++ b/modules/asset-generator.ts @@ -278,7 +278,7 @@ ${sp} }`; } }; - nuxt.hook("build:before", generateAssets); + await generateAssets(); if (nuxt.options.dev) { const watchAndRegenerate = ( diff --git a/modules/content-assets.ts b/modules/content-assets.ts index 1d87217..d8278e3 100644 --- a/modules/content-assets.ts +++ b/modules/content-assets.ts @@ -72,9 +72,7 @@ export default defineNuxtModule({ } }; - nuxt.hook("build:before", async () => { - await copyWebpFiles(); - }); + await copyWebpFiles(); if (nuxt.options.dev) { nuxt.hook("ready", () => {