From d87b421f98e09389173041c93fbbb237a34250f1 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 9 Apr 2025 07:40:24 -0700 Subject: [PATCH] Update static paths --- .devcontainer/docker-compose.devcontainer.sqlite-tika.yml | 6 +++--- .github/workflows/ci.yml | 6 +++--- .gitignore | 2 +- Dockerfile | 2 +- docs/troubleshooting.md | 2 +- src-ui/angular.json | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.devcontainer/docker-compose.devcontainer.sqlite-tika.yml b/.devcontainer/docker-compose.devcontainer.sqlite-tika.yml index 8aead7fe2..b96ab0eb0 100644 --- a/.devcontainer/docker-compose.devcontainer.sqlite-tika.yml +++ b/.devcontainer/docker-compose.devcontainer.sqlite-tika.yml @@ -44,7 +44,7 @@ services: - ..:/usr/src/paperless/paperless-ngx:delegated - ../.devcontainer/vscode:/usr/src/paperless/paperless-ngx/.vscode:delegated # VSCode config files - virtualenv:/usr/src/paperless/paperless-ngx/.venv # Virtual environment persisted in volume - - /usr/src/paperless/paperless-ngx/src/documents/static/frontend # Static frontend files exist only in container + - /usr/src/paperless/paperless-ngx/src/paperless/static/frontend # Static frontend files exist only in container - /usr/src/paperless/paperless-ngx/src/.pytest_cache - /usr/src/paperless/paperless-ngx/.ruff_cache - /usr/src/paperless/paperless-ngx/htmlcov @@ -58,11 +58,11 @@ services: PAPERLESS_TIKA_ENABLED: 1 PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000 PAPERLESS_TIKA_ENDPOINT: http://tika:9998 - PAPERLESS_STATICDIR: ./src/documents/static + PAPERLESS_STATICDIR: ./src/paperless/static PAPERLESS_DEBUG: true # Overrides default command so things don't shut down after the process ends. - command: /bin/sh -c "chown -R paperless:paperless /usr/src/paperless/paperless-ngx/src/documents/static/frontend && chown -R paperless:paperless /usr/src/paperless/paperless-ngx/.ruff_cache && while sleep 1000; do :; done" + command: /bin/sh -c "chown -R paperless:paperless /usr/src/paperless/paperless-ngx/src/paperless/static/frontend && chown -R paperless:paperless /usr/src/paperless/paperless-ngx/.ruff_cache && while sleep 1000; do :; done" gotenberg: image: docker.io/gotenberg/gotenberg:8.17 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56c2fdeec..1e177ebd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -430,13 +430,13 @@ jobs: name: Export frontend artifact from docker run: | docker create --name frontend-extract ${{ fromJSON(steps.docker-meta.outputs.json).tags[0] }} - docker cp frontend-extract:/usr/src/paperless/src/documents/static/frontend src/documents/static/frontend/ + docker cp frontend-extract:/usr/src/paperless/src/paperless/static/frontend src/paperless/static/frontend/ - name: Upload frontend artifact uses: actions/upload-artifact@v4 with: name: frontend-compiled - path: src/documents/static/frontend/ + path: src/paperless/static/frontend/ retention-days: 7 build-release: @@ -476,7 +476,7 @@ jobs: uses: actions/download-artifact@v4 with: name: frontend-compiled - path: src/documents/static/frontend/ + path: src/paperless/static/frontend/ - name: Download documentation artifact uses: actions/download-artifact@v4 diff --git a/.gitignore b/.gitignore index 452273705..f13c8e433 100644 --- a/.gitignore +++ b/.gitignore @@ -94,7 +94,7 @@ scripts/nuke /export/ # this is where the compiled frontend is moved to. -/src/documents/static/frontend/ +/src/paperless/static/frontend/ # mac os .DS_Store diff --git a/Dockerfile b/Dockerfile index 4a49a9ff2..c1ea8f785 100644 --- a/Dockerfile +++ b/Dockerfile @@ -234,7 +234,7 @@ RUN --mount=type=cache,target=${UV_CACHE_DIR},id=python-cache \ COPY --chown=1000:1000 ./src ./ # copy frontend -COPY --from=compile-frontend --chown=1000:1000 /src/src/documents/static/frontend/ ./documents/static/frontend/ +COPY --from=compile-frontend --chown=1000:1000 /src/src/paperless/static/frontend/ ./paperless/static/frontend/ # add users, setup scripts # Mount the compiled frontend to expected location diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index e9eaa5692..30ad64bf1 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -191,7 +191,7 @@ This might have multiple reasons. either manually or as part of the docker image build. If the front end is still missing, make sure that the front end is - compiled (files present in `src/documents/static/frontend`). If it + compiled (files present in `src/paperless/static/frontend`). If it is not, you need to compile the front end yourself or download the release archive instead of cloning the repository. diff --git a/src-ui/angular.json b/src-ui/angular.json index 60c91c3a1..4f0ab8691 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -100,7 +100,7 @@ "with": "src/environments/environment.prod.ts" } ], - "outputPath": "../src/documents/static/frontend/", + "outputPath": "../src/paperless/static/frontend/", "optimization": true, "outputHashing": "none", "sourceMap": false,