diff --git a/gitea/workflows/deploy.yml b/gitea/workflows/deploy.yml index 0c557d2..62c0765 100644 --- a/gitea/workflows/deploy.yml +++ b/gitea/workflows/deploy.yml @@ -52,8 +52,10 @@ jobs: - name: Copy current repo contents into target subfolder run: | - rm -R target/$TARGET_SUBFOLDER + rm -Rf target/template/content + rm -Rf target/$TARGET_SUBFOLDER mkdir -p target/$TARGET_SUBFOLDER + mkdir -p target/template/content # Exclude the .git directory from the copy rsync -av --exclude={.git,.obsidian,.gitea} current/content/ target/$TARGET_SUBFOLDER/ diff --git a/template/Dockerfile b/template/Dockerfile index c25fb99..a99866e 100644 --- a/template/Dockerfile +++ b/template/Dockerfile @@ -15,7 +15,7 @@ ARG CACHEBUST=1 COPY . . # Generate content files -RUN npm run convert +RUN node convert.js --vault ./vault --out ./content --img-prefix https://cdn.aranroig.com/campaigns/test --nuxt-img # Build the Nuxt app RUN npm run build diff --git a/template/package.json b/template/package.json index b43d20a..6786e96 100644 --- a/template/package.json +++ b/template/package.json @@ -4,7 +4,6 @@ "type": "module", "scripts": { "build": "nuxt build", - "convert": "node convert.js --vault ./template/vault --out ./template/content --img-prefix https://cdn.aranroig.com/campaigns/test --nuxt-img", "dev": "nuxt dev", "generate": "nuxt generate", "preview": "nuxt preview"