diff --git a/.devcontainer/restricted/devcontainer.json b/.devcontainer/restricted/devcontainer.json index a15b6cf..b87ffa5 100644 --- a/.devcontainer/restricted/devcontainer.json +++ b/.devcontainer/restricted/devcontainer.json @@ -3,6 +3,9 @@ "dockerfile": "../../docker/ci-runner.Dockerfile", "target": "devcontainer" }, + "features": { + "ghcr.io/devcontainers/features/desktop-lite:1": {} + }, "name": "Obsidian Timecodes Plugin - restricted container", "postCreateCommand": "pnpm install", diff --git a/docker/ci-runner.Dockerfile b/docker/ci-runner.Dockerfile index 4506c2d..8fb8ec3 100644 --- a/docker/ci-runner.Dockerfile +++ b/docker/ci-runner.Dockerfile @@ -66,9 +66,10 @@ RUN apt-get update \ USER node -COPY --chown=node:root --from=obsidian-extractor /squashfs-root /opt/obsidian-appimage-extracted +COPY --chown=node:node --from=obsidian-extractor /squashfs-root /home/node/obsidian-appimage-extracted -ENV OBSIDIAN_BINARY_PATH=/opt/obsidian-appimage-extracted/obsidian +ENV OBSIDIAN_BINARY_PATH=/home/node/obsidian-appimage-extracted/obsidian +ENV OBSIDIAN_NO_SANDBOX=true ENV DISPLAY=:1 RUN mkdir -p /home/node/Desktop @@ -79,8 +80,8 @@ COPY --chown=node:node --chmod=755 <<'EOF' /home/node/Desktop/obsidian-extracted Version=1.0 Type=Application Name=Obsidian (Extracted) -Exec=/opt/obsidian-appimage-extracted/obsidian -Icon=/opt/obsidian-appimage-extracted/obsidian.png +Exec=/home/node/obsidian-appimage-extracted/obsidian +Icon=/home/node/obsidian-appimage-extracted/obsidian.png Terminal=false EOF