Compare commits

...

6 Commits

Author SHA1 Message Date
xkrrudah 97bec6a651 Merge pull request '[MR]Modified upstreams.map' (#3) from develop into main
Deploy Main / deploy-main (push) Successful in 7s
Reviewed-on: #3
2026-08-15 21:15:41 +09:00
xkrrudah c920449562 Modified upstreams.map 2026-08-15 21:15:24 +09:00
xkrrudah b603bfd608 Merge pull request '[MR]Modified distribution/upstreams' (#2) from develop into main
Deploy Main / deploy-main (push) Successful in 9s
Reviewed-on: #2
2026-08-15 20:02:22 +09:00
xkrrudah b0aac6cbeb Modified distribution/upstreams 2026-08-15 20:02:00 +09:00
xkrrudah a5ee8ce5c5 Merge pull request '[MR]Added distribution' (#1) from develop into main
Deploy Main / deploy-main (push) Successful in 9s
Reviewed-on: #1
2026-08-15 19:58:58 +09:00
xkrrudah be6ac9b0bf Added distribution 2026-08-15 19:58:39 +09:00
4 changed files with 49 additions and 7 deletions
-3
View File
@@ -1,3 +0,0 @@
# Documentation only (network_mode: host reads the listen port from nginx.conf).
ERROR_PAGE_BIND=127.0.0.1
ERROR_PAGE_PORT=4098
+35
View File
@@ -0,0 +1,35 @@
name: Deploy Main
on:
push:
branches:
- main
workflow_dispatch:
env:
DEPLOY_DIR: /volume1/09_container_manager/14_error-page
jobs:
deploy-main:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Deploy on NAS
run: |
set -euo pipefail
mkdir -p "$DEPLOY_DIR/html"
cp docker-compose.yml "$DEPLOY_DIR/docker-compose.yml"
cp nginx.conf "$DEPLOY_DIR/nginx.conf"
cp upstreams.map "$DEPLOY_DIR/upstreams.map"
cp html/index.html "$DEPLOY_DIR/html/index.html"
rm -f "$DEPLOY_DIR/html/preview.html"
cd "$DEPLOY_DIR"
docker compose config --quiet
docker compose pull
docker compose up -d --force-recreate
docker compose ps
+10 -1
View File
@@ -13,12 +13,21 @@ DSM 리버스 프록시가 **앱 포트에 직접** 붙으면, 그 포트가 닫
## 배포
NAS 예: `/volume1/09_container_manager/@error-page`
`develop`에서 작업한 뒤 `main`에 머지하면 Gitea Actions가 아래 경로로 파일을 동기화하고 컨테이너를 재생성합니다.
```text
/volume1/09_container_manager/14_error-page
```
수동 실행:
```bash
cd /volume1/09_container_manager/14_error-page
docker compose up -d
```
별도 `.env`는 필요하지 않습니다. 이 서비스에는 비밀값이 없고, 수신 주소와 포트는 `nginx.conf`에서 `127.0.0.1:4098`로 고정합니다.
확인:
```bash
+4 -3
View File
@@ -11,8 +11,9 @@ map $host $app_port {
www.takits.me 4889;
fas.takits.me 4885;
ops.fas.takits.me 4887;
android-fas.takits.me 6080;
recap.takits.me 4890;
# dev-fas.takits.me 80xx;
# android-fas.takits.me 6080;
# ops.fas.takits.me 4887;
# dev-fas.takits.me 4886;
}