diff --git a/.gitignore b/.gitignore index 4aeef5b..cb27c21 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ node_modules postgres +key +key.pub + # Output .output .vercel diff --git a/articles b/articles deleted file mode 160000 index 1af78ed..0000000 --- a/articles +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1af78edd4c4e4e5b3834303e19f3507998019825 diff --git a/docker/app.Dockerfile b/docker/app.Dockerfile index c8c9bef..b684e14 100644 --- a/docker/app.Dockerfile +++ b/docker/app.Dockerfile @@ -15,11 +15,13 @@ RUN npm run build # For Run FROM node:22-slim -RUN apt-get update && apt-get install -y git - 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/package.json . diff --git a/src/lib/server/database/init_db.ts b/src/lib/server/database/init_db.ts index cd090f8..bcb5202 100644 --- a/src/lib/server/database/init_db.ts +++ b/src/lib/server/database/init_db.ts @@ -7,7 +7,7 @@ import { execSync } from 'child_process'; export default async function init(db: Postgres) { if (fs.existsSync('./articles/')) { 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()); }