diff --git a/Dockerfile b/Dockerfile index e9c3734..70354cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,9 +15,15 @@ COPY package.json . COPY package-lock.json* . RUN npm ci -FROM node:22-slim +FROM node:22-slim AS quartz 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"] +RUN npx quartz build + +FROM nginx:latest +WORKDIR /usr/share/nginx/html +COPY --from=quartz /usr/src/app/public/ /usr/share/nginx/html/ +WORKDIR /etc/nginx/ +COPY custom/nginx/default.conf /etc/nginx/conf.d/ \ No newline at end of file diff --git a/custom/compose.yaml b/custom/compose.yaml new file mode 100644 index 0000000..7e3822d --- /dev/null +++ b/custom/compose.yaml @@ -0,0 +1,7 @@ +services: + + web: + image: quartz-jpg + container_name: quartz-jpg + ports: + - "8080:80" \ No newline at end of file diff --git a/custom/docker-compose.yml b/custom/docker-compose.yml deleted file mode 100644 index 0357ea5..0000000 --- a/custom/docker-compose.yml +++ /dev/null @@ -1,12 +0,0 @@ -services: - quartz: - image: quartz-jpg - build: - context: . - dockerfile: Dockerfile - environment: - NODE_ENV: production - container_name: quartz-jpg-container - restart: always - ports: - - 8080:8080 diff --git a/custom/init-repos.sh b/custom/init-repos.sh new file mode 100644 index 0000000..e015688 --- /dev/null +++ b/custom/init-repos.sh @@ -0,0 +1,3 @@ +git remote add content https://git.marchal.dev/keb/jpg-content.git +git remote add convert-furigana https://git.marchal.dev/keb/jpg-convert-furigana.git +git remote add convert-usage https://git.marchal.dev/keb/jpg-convert-usage.git \ No newline at end of file diff --git a/custom/nginx/default.conf b/custom/nginx/default.conf new file mode 100644 index 0000000..314df22 --- /dev/null +++ b/custom/nginx/default.conf @@ -0,0 +1,13 @@ +server { + listen 80; + listen [::]:80; + server_name localhost; + + root /usr/share/nginx/html; + index index.html + error_page 404 /404.html; + + location / { + try_files $uri $uri.html $uri/ =404; + } +} \ No newline at end of file