This commit is contained in:
Saufi
2026-06-16 21:03:26 +08:00
parent 296d31b90c
commit 77a6d89bc2
5 changed files with 110 additions and 0 deletions

31
deploy.sh Normal file
View File

@@ -0,0 +1,31 @@
#!/bin/bash
# Kehadiran Taklimat SPR — Production Deploy Script
# Dipanggil oleh container webhook selepas git push ke GitHub (branch master).
set -e
PROJECT_DIR="/srv/spr2026_taklimat"
LOG="$PROJECT_DIR/deploy.log"
log() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" | tee -a "$LOG"; }
log "=== Deploy dimulakan ==="
cd "$PROJECT_DIR"
# git jalan sebagai root dlm container; repo milik user host -> elak "dubious ownership".
git config --global --add safe.directory "$PROJECT_DIR"
log "git pull..."
git pull origin master
# Kod di-bake dalam image (bukan bind-mount) -> perlu build semula.
# Hanya service aplikasi yg di-recreate; container 'webhook' SENGAJA tidak
# disenaraikan supaya ia tidak bunuh dirinya sendiri di tengah deploy.
# Entrypoint app jalankan migrate + config/route/view:cache automatik masa boot.
log "build & recreate (app, web, queue, scheduler)..."
docker compose up -d --build --force-recreate app web queue scheduler
log "buang image lama yg tidak digunakan..."
docker image prune -f
log "=== Deploy selesai ==="

View File

@@ -61,5 +61,25 @@ services:
depends_on: depends_on:
- app - app
# Webhook deploy (GitHub push -> git pull + rebuild). Dengar 127.0.0.1:9001;
# host nginx reverse-proxy /hooks/ ke sini. WEBHOOK_SECRET dari .env.docker.
webhook:
build:
context: ./docker/webhook
image: taklimatspr-webhook:latest
restart: unless-stopped
env_file:
- .env.docker
ports:
- "127.0.0.1:9001:9000"
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./docker/webhook/hooks.json:/etc/webhook/hooks.json:ro
- ./deploy.sh:/deploy.sh:ro
- .:/srv/spr2026_taklimat
# Kunci SSH host utk `git pull` repo peribadi (abaikan jika repo awam/HTTPS).
- /root/.ssh:/root/.ssh:ro
command: -hooks=/etc/webhook/hooks.json -hotreload -verbose
volumes: volumes:
app_storage: app_storage:

View File

@@ -29,4 +29,21 @@ server {
proxy_connect_timeout 30s; proxy_connect_timeout 30s;
proxy_read_timeout 60s; proxy_read_timeout 60s;
} }
# GitHub webhook deploy -> container webhook (adnanh/webhook) di 127.0.0.1:9001.
# Endpoint GitHub: https://taklimatspr.apps.mbip.my/hooks/deploy
location /hooks/ {
proxy_pass http://127.0.0.1:9001;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# Deploy (build) ambil masa; bagi masa yg cukup utk response.
proxy_read_timeout 600s;
} }
}
# NOTA: Selepas pasang SSL (certbot), blok di atas biasanya bertukar jadi
# `listen 443 ssl`. Pastikan KEDUA-DUA `location /` dan `location /hooks/`
# berada dalam blok 443 itu, dan `X-Forwarded-Proto $scheme` kekal ada.

10
docker/webhook/Dockerfile Normal file
View File

@@ -0,0 +1,10 @@
FROM golang:1.23-alpine AS builder
RUN go install github.com/adnanh/webhook@2.8.1
FROM alpine:3.21
# docker-cli + compose plugin: deploy.sh perlu `docker compose build`
# (kod taklimat di-bake dalam image, bukan bind-mount).
RUN apk add --no-cache git docker-cli docker-cli-compose openssh-client
COPY --from=builder /go/bin/webhook /usr/local/bin/webhook
EXPOSE 9000
ENTRYPOINT ["/usr/local/bin/webhook"]

32
docker/webhook/hooks.json Normal file
View File

@@ -0,0 +1,32 @@
[
{
"id": "deploy",
"execute-command": "/deploy.sh",
"command-working-directory": "/srv/spr2026_taklimat",
"response-message": "Deploy dimulakan.",
"trigger-rule": {
"and": [
{
"match": {
"type": "payload-hmac-sha256",
"secret": "{{ .Env.WEBHOOK_SECRET }}",
"parameter": {
"source": "header",
"name": "X-Hub-Signature-256"
}
}
},
{
"match": {
"type": "value",
"value": "refs/heads/master",
"parameter": {
"source": "payload",
"name": "ref"
}
}
}
]
}
}
]