mirror of
https://github.com/Nystik-gh/ignis.git
synced 2026-06-17 04:35:53 +00:00
docker, bump node version, install obsidian-headless on image start.
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
# Build shim-loader.js
|
# Build shim-loader.js
|
||||||
FROM node:20-slim AS build
|
FROM node:22-slim AS build
|
||||||
|
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
|
|
||||||
@@ -15,7 +15,7 @@ RUN npm run build
|
|||||||
|
|
||||||
# Production image. No Obsidian code included.
|
# Production image. No Obsidian code included.
|
||||||
# On first run, the entrypoint downloads and patches Obsidian.
|
# On first run, the entrypoint downloads and patches Obsidian.
|
||||||
FROM node:20-slim
|
FROM node:22-slim
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
ca-certificates curl binutils xz-utils gosu \
|
ca-certificates curl binutils xz-utils gosu \
|
||||||
|
|||||||
@@ -57,6 +57,27 @@ node /app/scripts/patch-obsidian.js "$OBSIDIAN_DIR"
|
|||||||
cp /app/dist/ignis-ui.js "$OBSIDIAN_DIR/ignis-ui.js"
|
cp /app/dist/ignis-ui.js "$OBSIDIAN_DIR/ignis-ui.js"
|
||||||
cp /app/dist/shim-loader.js "$OBSIDIAN_DIR/shim-loader.js"
|
cp /app/dist/shim-loader.js "$OBSIDIAN_DIR/shim-loader.js"
|
||||||
cp /app/images/favicon.png "$OBSIDIAN_DIR/favicon.png"
|
cp /app/images/favicon.png "$OBSIDIAN_DIR/favicon.png"
|
||||||
|
cp /app/server/assets/* "$OBSIDIAN_DIR/" 2>/dev/null || true
|
||||||
|
|
||||||
|
# Install obsidian-headless (ob CLI) if not already present.
|
||||||
|
# Not included in the image for legal reasons - installed at runtime.
|
||||||
|
if ! command -v ob &>/dev/null; then
|
||||||
|
echo "[ignis] Installing obsidian-headless..."
|
||||||
|
|
||||||
|
if npm install -g --prefix /usr/local obsidian-headless --silent 2>/dev/null; then
|
||||||
|
OB_VERSION=$(ob --version 2>/dev/null)
|
||||||
|
|
||||||
|
if [ -n "$OB_VERSION" ]; then
|
||||||
|
echo "[ignis] obsidian-headless $OB_VERSION installed."
|
||||||
|
else
|
||||||
|
echo "[ignis] WARNING: obsidian-headless installed but 'ob' command not working."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "[ignis] WARNING: Failed to install obsidian-headless. Headless sync will not be available."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "[ignis] obsidian-headless $(ob --version 2>/dev/null) available."
|
||||||
|
fi
|
||||||
|
|
||||||
# Run as the determined user
|
# Run as the determined user
|
||||||
exec gosu "$RUN_USER" node /app/server/index.js
|
exec gosu "$RUN_USER" node /app/server/index.js
|
||||||
Reference in New Issue
Block a user