Hare/blog.hareworks.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: change article managment: git submodules to dynamic git clone&pull #7

Merged
Hare merged 5 commits from develop into master 2024-09-03 07:01:15 +09:00
Conversation 0 Commits 5 Files Changed 4 +9 -5
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,6 +1,9 @@
node_modules node_modules
postgres postgres
key
key.pub
# Output # Output
.output .output
.vercel .vercel

1
articles

@ -1 +0,0 @@
Subproject commit 1af78edd4c4e4e5b3834303e19f3507998019825

8
docker/app.Dockerfile
View File

@ -15,11 +15,13 @@ RUN npm run build
# For Run # For Run
FROM node:22-slim FROM node:22-slim
RUN apt-get update && apt-get install -y git
WORKDIR /app WORKDIR /app
COPY ./articles ./articles COPY ./key ./key
RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/* && \
mkdir -p ~/.ssh && \
ssh-keyscan -t rsa gitea.hareworks.net >> ~/.ssh/known_hosts && \
git -c core.sshCommand="ssh -i ./key -F /dev/null" clone git@gitea.hareworks.net:Hare/blog-articles.git articles
COPY --from=builder /app/build ./build COPY --from=builder /app/build ./build
COPY --from=builder /app/package.json . COPY --from=builder /app/package.json .

2
src/lib/server/database/init_db.ts
View File

@ -7,7 +7,7 @@ import { execSync } from 'child_process';
export default async function init(db: Postgres) { export default async function init(db: Postgres) {
if (fs.existsSync('./articles/')) { if (fs.existsSync('./articles/')) {
console.log('Pulling articles from git..'); console.log('Pulling articles from git..');
const stdout = execSync('git pull', { cwd: './articles/' }); const stdout = execSync('git -c core.sshCommand="ssh -i ../key -F /dev/null" pull', { cwd: './articles/' });
console.log(stdout.toString()); console.log(stdout.toString());
} }