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

Compare commits

base: Hare:78d733ace6d723744d2400374883fe092207eaaf
Branches Tags
Hare:master
Hare:develop
..
compare: Hare:41674ea6a175c8917f8e793506638a81ee50d606
Branches Tags
Hare:master
Hare:develop

6 Commits
78d733ace6 ... 41674ea6a1

Author SHA1 Message Date
Keisuke Hirata
41674ea6a1 Merge pull request 'feat: change article managment: git submodules to dynamic git clone&pull' (#7) from develop into master 
Reviewed-on: #7
 2024-09-03 07:01:14 +09:00
Hare
d7483f0f00 Merge branch 'develop' of gitea.hareworks.net:Hare/blog.hareworks.net into develop 2024-09-03 06:58:15 +09:00
Hare
04f9bd5e99 chore: Update git command to use custom SSH key for pulling articles 2024-09-03 06:58:13 +09:00
Hare
8a5d09d615 chore: Update Dockerfile to clone blog articles repository 2024-09-03 06:52:49 +09:00
Hare
700304b466 chore: Add key files to .gitignore 2024-09-03 06:52:35 +09:00
Hare
126e748955 chore: Remove articles subproject 2024-09-03 06:04:28 +09:00
4 changed files with 9 additions and 5 deletions
Show Stats 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());
} }