Docker Compose 構成をシンプル化: 本番=docker-compose.yml、開発=docker-compose.develop.yml
- docker-compose.yml を本番用に変更(旧 docker-compose.prod.yml の内容) - docker-compose.develop.yml を新規追加(開発用) - deploy.sh を追加(本番デプロイスクリプト) - develop.bat を追加(ローカル開発起動スクリプト) - docker-compose.prod.yml を削除 - 本番サーバーに .env → .env.production シンボリックリンク設置済み - CLAUDE.md のデプロイコマンドを更新 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
20
CLAUDE.md
20
CLAUDE.md
@@ -405,14 +405,16 @@ Phase 2 のタスクに進む段階。
|
||||
### 本番デプロイコマンド(必須)
|
||||
|
||||
```bash
|
||||
# ⚠️ --env-file .env.production を必ず付けること(省略するとSECRET_KEYが空でbackendが起動しない)
|
||||
# ⚠️ 本番ファイルは keinasystem ユーザー所有。git pull は sudo -u keinasystem で実行
|
||||
ssh keinafarm-claude 'sudo -u keinasystem git -C /home/keinasystem/keinasystem_t02 pull origin main && \
|
||||
cd /home/keinasystem/keinasystem_t02 && \
|
||||
sudo -u keinasystem docker compose -f docker-compose.prod.yml --env-file .env.production build && \
|
||||
sudo -u keinasystem docker compose -f docker-compose.prod.yml --env-file .env.production up -d'
|
||||
# deploy.sh で git pull → down → build → up -d を一括実行
|
||||
ssh keinafarm-claude 'sudo -u keinasystem bash /home/keinasystem/keinasystem_t02/deploy.sh'
|
||||
```
|
||||
|
||||
**Docker Compose 構成:**
|
||||
- `docker-compose.yml` = 本番用(Traefik連携、gunicorn、prod Dockerfile)
|
||||
- `docker-compose.develop.yml` = 開発用(ホットリロード、DEBUG=True)
|
||||
- 本番サーバー: `.env` → `.env.production` シンボリックリンク
|
||||
- `deploy.sh` = 本番デプロイ、`develop.bat` = ローカル開発起動
|
||||
|
||||
### 本番確認手順(デプロイ後の必須チェック)
|
||||
|
||||
**⚠️ Playwright(ビジュアルテスト)を使う前に、必ずcurlで先に確認すること。**
|
||||
@@ -432,10 +434,10 @@ bash scripts/check_prod.sh claude keina1234
|
||||
**本番バックエンドのマイグレーション適用(バックエンド変更時のみ):**
|
||||
```bash
|
||||
ssh keinafarm-claude 'cd /home/keinasystem/keinasystem_t02 && \
|
||||
sudo -u keinasystem docker compose -f docker-compose.prod.yml --env-file .env.production build backend && \
|
||||
sudo -u keinasystem docker compose -f docker-compose.prod.yml --env-file .env.production up -d && \
|
||||
sudo -u keinasystem docker compose build backend && \
|
||||
sudo -u keinasystem docker compose up -d && \
|
||||
sleep 5 && \
|
||||
sudo -u keinasystem docker compose -f docker-compose.prod.yml --env-file .env.production exec backend python manage.py migrate'
|
||||
sudo -u keinasystem docker compose exec backend python manage.py migrate'
|
||||
```
|
||||
|
||||
### マイグレーションエラー
|
||||
|
||||
22
deploy.sh
Normal file
22
deploy.sh
Normal file
@@ -0,0 +1,22 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
echo "=== KeinaSystem デプロイ ==="
|
||||
|
||||
echo "[1/4] git pull..."
|
||||
git pull origin main
|
||||
|
||||
echo "[2/4] docker compose down..."
|
||||
docker compose down
|
||||
|
||||
echo "[3/4] docker compose build..."
|
||||
docker compose build
|
||||
|
||||
echo "[4/4] docker compose up -d..."
|
||||
docker compose up -d
|
||||
|
||||
echo ""
|
||||
echo "=== デプロイ完了 ==="
|
||||
docker compose ps
|
||||
20
develop.bat
Normal file
20
develop.bat
Normal file
@@ -0,0 +1,20 @@
|
||||
@echo off
|
||||
cd /d "%~dp0"
|
||||
|
||||
echo === KeinaSystem 開発環境起動 ===
|
||||
|
||||
echo [1/3] docker compose down...
|
||||
docker compose -f docker-compose.develop.yml down
|
||||
|
||||
echo [2/3] docker compose build...
|
||||
docker compose -f docker-compose.develop.yml build
|
||||
|
||||
echo [3/3] docker compose up -d...
|
||||
docker compose -f docker-compose.develop.yml up -d
|
||||
|
||||
echo.
|
||||
echo === 開発環境起動完了 ===
|
||||
docker compose -f docker-compose.develop.yml ps
|
||||
echo.
|
||||
echo Frontend: http://localhost:3000
|
||||
echo Backend: http://localhost:8000
|
||||
59
docker-compose.develop.yml
Normal file
59
docker-compose.develop.yml
Normal file
@@ -0,0 +1,59 @@
|
||||
services:
|
||||
db:
|
||||
image: postgis/postgis:16-3.4
|
||||
container_name: keinasystem_db
|
||||
environment:
|
||||
POSTGRES_DB: keinasystem
|
||||
POSTGRES_USER: keinasystem
|
||||
POSTGRES_PASSWORD: ${DB_PASSWORD}
|
||||
ports:
|
||||
- "5432:5432"
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U keinasystem -d keinasystem"]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
backend:
|
||||
build:
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile
|
||||
container_name: keinasystem_backend
|
||||
environment:
|
||||
DB_NAME: keinasystem
|
||||
DB_USER: keinasystem
|
||||
DB_PASSWORD: ${DB_PASSWORD}
|
||||
DB_HOST: db
|
||||
DB_PORT: 5432
|
||||
SECRET_KEY: ${SECRET_KEY}
|
||||
DEBUG: "True"
|
||||
MAIL_API_KEY: ${MAIL_API_KEY}
|
||||
ports:
|
||||
- "8000:8000"
|
||||
volumes:
|
||||
- ./backend:/app
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
command: python manage.py runserver 0.0.0.0:8000
|
||||
|
||||
frontend:
|
||||
build:
|
||||
context: ./frontend
|
||||
dockerfile: Dockerfile
|
||||
container_name: keinasystem_frontend
|
||||
environment:
|
||||
NEXT_PUBLIC_API_URL: http://localhost:8000
|
||||
WATCHPACK_POLLING: "true"
|
||||
ports:
|
||||
- "3000:3000"
|
||||
volumes:
|
||||
- ./frontend:/app
|
||||
- /app/node_modules
|
||||
depends_on:
|
||||
- backend
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
@@ -1,84 +0,0 @@
|
||||
version: '3.8'
|
||||
|
||||
networks:
|
||||
traefik-net:
|
||||
external: true
|
||||
internal:
|
||||
internal: true
|
||||
|
||||
services:
|
||||
db:
|
||||
image: postgis/postgis:16-3.4
|
||||
container_name: keinasystem_db
|
||||
restart: always
|
||||
environment:
|
||||
POSTGRES_DB: keinasystem
|
||||
POSTGRES_USER: keinasystem
|
||||
POSTGRES_PASSWORD: ${DB_PASSWORD}
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U keinasystem -d keinasystem"]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
networks:
|
||||
- internal
|
||||
|
||||
backend:
|
||||
build:
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile.prod
|
||||
container_name: keinasystem_backend
|
||||
restart: always
|
||||
environment:
|
||||
DB_NAME: keinasystem
|
||||
DB_USER: keinasystem
|
||||
DB_PASSWORD: ${DB_PASSWORD}
|
||||
DB_HOST: db
|
||||
DB_PORT: 5432
|
||||
SECRET_KEY: ${SECRET_KEY}
|
||||
DEBUG: "False"
|
||||
ALLOWED_HOSTS: main.keinafarm.net
|
||||
CORS_ALLOWED_ORIGINS: https://main.keinafarm.net
|
||||
MAIL_API_KEY: ${MAIL_API_KEY}
|
||||
FRONTEND_URL: https://main.keinafarm.net
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
networks:
|
||||
- internal
|
||||
- traefik-net
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.keinasystem-api.rule=Host(`main.keinafarm.net`) && PathPrefix(`/api/`)"
|
||||
- "traefik.http.routers.keinasystem-api.entrypoints=websecure"
|
||||
- "traefik.http.routers.keinasystem-api.tls=true"
|
||||
- "traefik.http.routers.keinasystem-api.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.routers.keinasystem-api.priority=10"
|
||||
- "traefik.http.services.keinasystem-api.loadbalancer.server.port=8000"
|
||||
- "traefik.docker.network=traefik-net"
|
||||
|
||||
frontend:
|
||||
build:
|
||||
context: ./frontend
|
||||
dockerfile: Dockerfile.prod
|
||||
args:
|
||||
NEXT_PUBLIC_API_URL: https://main.keinafarm.net
|
||||
container_name: keinasystem_frontend
|
||||
restart: always
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- traefik-net
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.keinasystem.rule=Host(`main.keinafarm.net`)"
|
||||
- "traefik.http.routers.keinasystem.entrypoints=websecure"
|
||||
- "traefik.http.routers.keinasystem.tls=true"
|
||||
- "traefik.http.routers.keinasystem.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.routers.keinasystem.priority=5"
|
||||
- "traefik.http.services.keinasystem.loadbalancer.server.port=3000"
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
@@ -1,15 +1,18 @@
|
||||
version: '3.8'
|
||||
networks:
|
||||
traefik-net:
|
||||
external: true
|
||||
internal:
|
||||
internal: true
|
||||
|
||||
services:
|
||||
db:
|
||||
image: postgis/postgis:16-3.4
|
||||
container_name: keinasystem_db
|
||||
restart: always
|
||||
environment:
|
||||
POSTGRES_DB: keinasystem
|
||||
POSTGRES_USER: keinasystem
|
||||
POSTGRES_PASSWORD: ${DB_PASSWORD}
|
||||
ports:
|
||||
- "5432:5432"
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
@@ -17,12 +20,15 @@ services:
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
networks:
|
||||
- internal
|
||||
|
||||
backend:
|
||||
build:
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile
|
||||
dockerfile: Dockerfile.prod
|
||||
container_name: keinasystem_backend
|
||||
restart: always
|
||||
environment:
|
||||
DB_NAME: keinasystem
|
||||
DB_USER: keinasystem
|
||||
@@ -30,32 +36,47 @@ services:
|
||||
DB_HOST: db
|
||||
DB_PORT: 5432
|
||||
SECRET_KEY: ${SECRET_KEY}
|
||||
DEBUG: "True"
|
||||
DEBUG: "False"
|
||||
ALLOWED_HOSTS: main.keinafarm.net
|
||||
CORS_ALLOWED_ORIGINS: https://main.keinafarm.net
|
||||
MAIL_API_KEY: ${MAIL_API_KEY}
|
||||
ports:
|
||||
- "8000:8000"
|
||||
volumes:
|
||||
- ./backend:/app
|
||||
FRONTEND_URL: https://main.keinafarm.net
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
command: python manage.py runserver 0.0.0.0:8000
|
||||
networks:
|
||||
- internal
|
||||
- traefik-net
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.keinasystem-api.rule=Host(`main.keinafarm.net`) && PathPrefix(`/api/`)"
|
||||
- "traefik.http.routers.keinasystem-api.entrypoints=websecure"
|
||||
- "traefik.http.routers.keinasystem-api.tls=true"
|
||||
- "traefik.http.routers.keinasystem-api.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.routers.keinasystem-api.priority=10"
|
||||
- "traefik.http.services.keinasystem-api.loadbalancer.server.port=8000"
|
||||
- "traefik.docker.network=traefik-net"
|
||||
|
||||
frontend:
|
||||
build:
|
||||
context: ./frontend
|
||||
dockerfile: Dockerfile
|
||||
dockerfile: Dockerfile.prod
|
||||
args:
|
||||
NEXT_PUBLIC_API_URL: https://main.keinafarm.net
|
||||
container_name: keinasystem_frontend
|
||||
environment:
|
||||
NEXT_PUBLIC_API_URL: http://localhost:8000
|
||||
WATCHPACK_POLLING: "true"
|
||||
ports:
|
||||
- "3000:3000"
|
||||
volumes:
|
||||
- ./frontend:/app
|
||||
- /app/node_modules
|
||||
restart: always
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- traefik-net
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.keinasystem.rule=Host(`main.keinafarm.net`)"
|
||||
- "traefik.http.routers.keinasystem.entrypoints=websecure"
|
||||
- "traefik.http.routers.keinasystem.tls=true"
|
||||
- "traefik.http.routers.keinasystem.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.routers.keinasystem.priority=5"
|
||||
- "traefik.http.services.keinasystem.loadbalancer.server.port=3000"
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
|
||||
Reference in New Issue
Block a user