From 189309a4c0ded03c90d08ba82d677722314b4ba7 Mon Sep 17 00:00:00 2001
From: ota-meshi <otameshiyo23@gmail.com>
Date: Wed, 25 Dec 2024 09:47:13 +0900
Subject: [PATCH] update

---
 .puppeteer.json                        |  3 +++
 build-resources-with-pandoc.sh         | 13 ++++++++-----
 documents/forGitBranch/.puppeteer.json |  4 ----
 3 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 .puppeteer.json
 delete mode 100644 documents/forGitBranch/.puppeteer.json

diff --git a/.puppeteer.json b/.puppeteer.json
new file mode 100644
index 00000000..000beaa0
--- /dev/null
+++ b/.puppeteer.json
@@ -0,0 +1,3 @@
+{
+  "executablePath": "/usr/bin/chromium-browser"
+}
diff --git a/build-resources-with-pandoc.sh b/build-resources-with-pandoc.sh
index 8df5bbed..92dbd717 100644
--- a/build-resources-with-pandoc.sh
+++ b/build-resources-with-pandoc.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -e
 
+ROOT_DIR=`pwd`
+CSS_PATH="${ROOT_DIR}/documents/common/pandoc_styles/css/style.css"
+STYLE_DOCX_PATH="${ROOT_DIR}/documents/common/pandoc_styles/スタイル.docx"
+RESOURCES_DIR="${ROOT_DIR}/public/resources"
+
 cat /etc/alpine-release
 apk update
 apk add nodejs npm
@@ -8,14 +13,12 @@ apk add --update chromium
 node -v
 npm -v
 chromium-browser --version
-export PUPPETEER_SKIP_DOWNLOAD='true'
+export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+export MERMAID_FILTER_PUPPETEER_CONFIG="${ROOT_DIR}/.puppeteer.json"
+export PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 # export MERMAID_FILTER_FORMAT='svg'
 npm i -g mermaid-filter@1.4.5
 
-ROOT_DIR=`pwd`
-CSS_PATH="${ROOT_DIR}/documents/common/pandoc_styles/css/style.css"
-STYLE_DOCX_PATH="${ROOT_DIR}/documents/common/pandoc_styles/スタイル.docx"
-RESOURCES_DIR="${ROOT_DIR}/public/resources"
 
 # Java
 cd ${ROOT_DIR}/documents/forJava
diff --git a/documents/forGitBranch/.puppeteer.json b/documents/forGitBranch/.puppeteer.json
deleted file mode 100644
index 0055f79d..00000000
--- a/documents/forGitBranch/.puppeteer.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "executablePath": "/usr/bin/chromium-browser",
-  "args": ["--no-sandbox"]
-}