From 1ce534d69624a17947df684863d53a333004cbb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Marchal?= Date: Sun, 7 Apr 2024 00:20:19 +0200 Subject: [PATCH] Apply convert scripts in Dockerfile --- Dockerfile | 12 ++++++++++++ custom/docker-compose.yml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1d9e591..964c254 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,14 @@ +FROM python:latest as convert +WORKDIR /usr/src/app +COPY content/ ./ +COPY custom/convert-furigana/program/convert-furigana.py ./ +COPY custom/convert-usage/program/convert-usage.py ./ +ENV PIP_ROOT_USER_ACTION=ignore +RUN python -m pip install --upgrade pip +RUN python -m pip install beautifulsoup4 +RUN python convert-furigana.py . +RUN python convert-usage.py . + FROM node:20-slim as builder WORKDIR /usr/src/app COPY package.json . @@ -8,4 +19,5 @@ FROM node:20-slim WORKDIR /usr/src/app COPY --from=builder /usr/src/app/ /usr/src/app/ COPY . . +COPY --from=convert /usr/src/app/ /usr/src/app/content/ CMD ["npx", "quartz", "build", "--serve"] diff --git a/custom/docker-compose.yml b/custom/docker-compose.yml index b4f1244..c13013e 100644 --- a/custom/docker-compose.yml +++ b/custom/docker-compose.yml @@ -8,7 +8,7 @@ services: dockerfile: Dockerfile environment: NODE_ENV: production - container_name: quartz + container_name: quartz-jpg-container restart: always ports: - 8080:8080