Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Render env vars in caddy-reconfigure script (#30673)

Browse Source 
Move more logic in managing Caddy into Javascript from the shell script.
This commit is contained in:
Shrikant Sharat Kandula 2024-01-31 11:38:49 +05:30 committed by GitHub
parent d9835d5444
commit 82c24a1190
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
deploy/docker/fs/opt/appsmith/caddy-reconfigure.mjs
View File

@ -155,11 +155,27 @@ if (CUSTOM_DOMAIN !== "") {
`) `)
} }
finalizeIndexHtml()
fs.mkdirSync(dirname(CaddyfilePath), { recursive: true }) fs.mkdirSync(dirname(CaddyfilePath), { recursive: true })
fs.writeFileSync(CaddyfilePath, parts.join("\n")) fs.writeFileSync(CaddyfilePath, parts.join("\n"))
spawnSync("/opt/caddy/caddy", ["fmt", "--overwrite", CaddyfilePath]) spawnSync("/opt/caddy/caddy", ["fmt", "--overwrite", CaddyfilePath])
spawnSync("/opt/caddy/caddy", ["reload", "--config", CaddyfilePath]) spawnSync("/opt/caddy/caddy", ["reload", "--config", CaddyfilePath])
function finalizeIndexHtml() {
const info = JSON.parse(fs.readFileSync("/opt/appsmith/info.json", "utf8"))
const extraEnv = {
APPSMITH_VERSION_ID: info.version ?? "",
APPSMITH_VERSION_RELEASE_DATE: info.imageBuiltAt ?? "",
}
const content = fs.readFileSync("/opt/appsmith/editor/index.html", "utf8").replace(
/\b__(APPSMITH_[A-Z0-9_]+)__\b/g,
(_, name) => (process.env[name] || extraEnv[name] || "")
)
fs.writeFileSync(process.env.WWW_PATH + "/index.html", content)
}
function isCertExpired(path) { function isCertExpired(path) {
const cert = new X509Certificate(fs.readFileSync(path, "utf-8")) const cert = new X509Certificate(fs.readFileSync(path, "utf-8"))
console.log(path, cert) console.log(path, cert)

27
deploy/docker/fs/opt/appsmith/run-caddy.sh
View File

@ -9,31 +9,12 @@ if [[ -z "${APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX-}" ]]; then
export APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX="true" export APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX="true"
fi fi
apply-env-vars() {
original="$1"
served="$2"
node -e '
const fs = require("fs")
try {
const info = JSON.parse(fs.readFileSync("/opt/appsmith/info.json", "utf8"))
process.env.APPSMITH_VERSION_ID = info.version || ""
process.env.APPSMITH_VERSION_RELEASE_DATE = info.imageBuiltAt || ""
} catch {}
const content = fs.readFileSync("'"$original"'", "utf8").replace(
/\b__(APPSMITH_[A-Z0-9_]+)__\b/g,
(placeholder, name) => (process.env[name] || "")
)
fs.writeFileSync("'"$served"'", content)
'
pushd "$(dirname "$served")"
gzip --keep --force "$(basename "$served")"
popd
}
apply-env-vars /opt/appsmith/editor/index.html "$WWW_PATH/index.html"
node caddy-reconfigure.mjs node caddy-reconfigure.mjs
pushd "$(dirname "$WWW_PATH/index.html")"
gzip --keep --force "$(basename "$WWW_PATH/index.html")"
popd
# Caddy may already be running for the loading page. # Caddy may already be running for the loading page.
/opt/caddy/caddy stop --config "$TMP/Caddyfile" || true /opt/caddy/caddy stop --config "$TMP/Caddyfile" || true