From 2594cbfbf1d96d01297a0aa90a7fbbedaa9cb775 Mon Sep 17 00:00:00 2001 From: Sebastian Pietras Date: Wed, 27 Mar 2024 15:55:49 +0100 Subject: [PATCH] Fetched template changes --- .copier-answers.yaml | 2 +- .github/workflows/docs.yaml | 2 +- .github/workflows/lint.yaml | 2 +- Dockerfile | 2 +- docs/package.json | 4 ++-- scripts/entrypoint.sh | 3 --- scripts/env.sh | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index 2fb74ad..906da70 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: 0.2.0 +_commit: 0.3.0 _src_path: gh:radio-aktywne/template-app-liquidsoap accountname: radio-aktywne appname: fusion diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 34ebb41..ec29868 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -86,7 +86,7 @@ jobs: if: "!cancelled()" run: > mkdir - -p + --parents ${{ env.NIX_CACHE_DIR }} && nix-store diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index ff5ce06..b8424e8 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -102,7 +102,7 @@ jobs: if: "!cancelled()" run: > mkdir - -p + --parents ${{ env.NIX_CACHE_DIR }} && nix-store diff --git a/Dockerfile b/Dockerfile index bb8927e..49c5c0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,4 +50,4 @@ ENTRYPOINT ["/app/scripts/entrypoint.sh", "liquidsoap", "src/main.liq"] CMD [] # Setup ownership -RUN chown -R app: /app/ +RUN chown --recursive app: ./ diff --git a/docs/package.json b/docs/package.json index 3856de8..b972839 100644 --- a/docs/package.json +++ b/docs/package.json @@ -4,9 +4,9 @@ "scripts": { "docs": "docusaurus", "update": "ncu --peer --doctor --upgrade && npm i --no-audit --no-fund", - "postupdate": "rm -rf .tmp/", + "postupdate": "rm --recursive --force .tmp/", "test": "docusaurus build --out-dir .tmp/", - "posttest": "rm -rf .tmp/" + "posttest": "rm --recursive --force .tmp/" }, "engines": { "node": ">=18.0" diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index 46b4b05..c006e6e 100755 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -4,9 +4,6 @@ # shellcheck source=/dev/null . /env/activate -# Set permissions -chown -R app: /app/ - # Run as non-root user # Use tini to handle signals exec su-exec app tini -- "$@" diff --git a/scripts/env.sh b/scripts/env.sh index e2b065c..684c1ab 100755 --- a/scripts/env.sh +++ b/scripts/env.sh @@ -25,7 +25,7 @@ if [[ -f "${_cache}/archive.nar" ]]; then fi # We need to create necessary directories first -mkdir -p "${_build}/closure/" +mkdir --parents "${_build}/closure/" # Save system to variable so we can reuse it easily _system=$(nix eval --impure --raw --expr 'builtins.currentSystem')