Compare commits

...

2 Commits

Author SHA1 Message Date
Akira
391b0b265e for serena 2026-03-15 15:44:58 +09:00
Akira
736b9c824e 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>
2026-03-15 15:43:50 +09:00
9 changed files with 291 additions and 113 deletions

View File

@@ -67,7 +67,8 @@
"Bash(git diff:*)"
],
"additionalDirectories": [
"C:\\Users\\akira\\AppData\\Local\\Temp"
"C:\\Users\\akira\\AppData\\Local\\Temp",
"C:\\Users\\akira\\Develop\\keinasystem_t02"
]
}
}

2
.serena/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
/cache
/project.local.yml

135
.serena/project.yml Normal file
View File

@@ -0,0 +1,135 @@
# the name by which the project can be referenced within Serena
project_name: "keinasystem_t02"
# list of languages for which language servers are started; choose from:
# al bash clojure cpp csharp
# csharp_omnisharp dart elixir elm erlang
# fortran fsharp go groovy haskell
# java julia kotlin lua markdown
# matlab nix pascal perl php
# php_phpactor powershell python python_jedi r
# rego ruby ruby_solargraph rust scala
# swift terraform toml typescript typescript_vts
# vue yaml zig
# (This list may be outdated. For the current list, see values of Language enum here:
# https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py
# For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
# Note:
# - For C, use cpp
# - For JavaScript, use typescript
# - For Free Pascal/Lazarus, use pascal
# Special requirements:
# Some languages require additional setup/installations.
# See here for details: https://oraios.github.io/serena/01-about/020_programming-languages.html#language-servers
# When using multiple languages, the first language server that supports a given file will be used for that file.
# The first language is the default language and the respective language server will be used as a fallback.
# Note that when using the JetBrains backend, language servers are not used and this list is correspondingly ignored.
languages:
- python
# the encoding used by text files in the project
# For a list of possible encodings, see https://docs.python.org/3.11/library/codecs.html#standard-encodings
encoding: "utf-8"
# line ending convention to use when writing source files.
# Possible values: unset (use global setting), "lf", "crlf", or "native" (platform default)
# This does not affect Serena's own files (e.g. memories and configuration files), which always use native line endings.
line_ending:
# The language backend to use for this project.
# If not set, the global setting from serena_config.yml is used.
# Valid values: LSP, JetBrains
# Note: the backend is fixed at startup. If a project with a different backend
# is activated post-init, an error will be returned.
language_backend:
# whether to use project's .gitignore files to ignore files
ignore_all_files_in_gitignore: true
# list of additional paths to ignore in this project.
# Same syntax as gitignore, so you can use * and **.
# Note: global ignored_paths from serena_config.yml are also applied additively.
ignored_paths: []
# whether the project is in read-only mode
# If set to true, all editing tools will be disabled and attempts to use them will result in an error
# Added on 2025-04-18
read_only: false
# list of tool names to exclude. We recommend not excluding any tools, see the readme for more details.
# Below is the complete list of tools for convenience.
# To make sure you have the latest list of tools, and to view their descriptions,
# execute `uv run scripts/print_tool_overview.py`.
#
# * `activate_project`: Activates a project by name.
# * `check_onboarding_performed`: Checks whether project onboarding was already performed.
# * `create_text_file`: Creates/overwrites a file in the project directory.
# * `delete_lines`: Deletes a range of lines within a file.
# * `delete_memory`: Deletes a memory from Serena's project-specific memory store.
# * `execute_shell_command`: Executes a shell command.
# * `find_referencing_code_snippets`: Finds code snippets in which the symbol at the given location is referenced.
# * `find_referencing_symbols`: Finds symbols that reference the symbol at the given location (optionally filtered by type).
# * `find_symbol`: Performs a global (or local) search for symbols with/containing a given name/substring (optionally filtered by type).
# * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
# * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
# * `initial_instructions`: Gets the initial instructions for the current project.
# Should only be used in settings where the system prompt cannot be set,
# e.g. in clients you have no control over, like Claude Desktop.
# * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
# * `insert_at_line`: Inserts content at a given line in a file.
# * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
# * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
# * `list_memories`: Lists memories in Serena's project-specific memory store.
# * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
# * `prepare_for_new_conversation`: Provides instructions for preparing for a new conversation (in order to continue with the necessary context).
# * `read_file`: Reads a file within the project directory.
# * `read_memory`: Reads the memory with the given name from Serena's project-specific memory store.
# * `remove_project`: Removes a project from the Serena configuration.
# * `replace_lines`: Replaces a range of lines within a file with new content.
# * `replace_symbol_body`: Replaces the full definition of a symbol.
# * `restart_language_server`: Restarts the language server, may be necessary when edits not through Serena happen.
# * `search_for_pattern`: Performs a search for a pattern in the project.
# * `summarize_changes`: Provides instructions for summarizing the changes made to the codebase.
# * `switch_modes`: Activates modes by providing a list of their names
# * `think_about_collected_information`: Thinking tool for pondering the completeness of collected information.
# * `think_about_task_adherence`: Thinking tool for determining whether the agent is still on track with the current task.
# * `think_about_whether_you_are_done`: Thinking tool for determining whether the task is truly completed.
# * `write_memory`: Writes a named memory (for future reference) to Serena's project-specific memory store.
excluded_tools: []
# list of tools to include that would otherwise be disabled (particularly optional tools that are disabled by default)
included_optional_tools: []
# fixed set of tools to use as the base tool set (if non-empty), replacing Serena's default set of tools.
# This cannot be combined with non-empty excluded_tools or included_optional_tools.
fixed_tools: []
# list of mode names to that are always to be included in the set of active modes
# The full set of modes to be activated is base_modes + default_modes.
# If the setting is undefined, the base_modes from the global configuration (serena_config.yml) apply.
# Otherwise, this setting overrides the global configuration.
# Set this to [] to disable base modes for this project.
# Set this to a list of mode names to always include the respective modes for this project.
base_modes:
# list of mode names that are to be activated by default.
# The full set of modes to be activated is base_modes + default_modes.
# If the setting is undefined, the default_modes from the global configuration (serena_config.yml) apply.
# Otherwise, this overrides the setting from the global configuration (serena_config.yml).
# This setting can, in turn, be overridden by CLI parameters (--mode).
default_modes:
# initial prompt for the project. It will always be given to the LLM upon activating the project
# (contrary to the memories, which are loaded on demand).
initial_prompt: ""
# time budget (seconds) per tool call for the retrieval of additional symbol information
# such as docstrings or parameter information.
# This overrides the corresponding setting in the global configuration; see the documentation there.
# If null or missing, use the setting from the global configuration.
symbol_info_budget:
# list of regex patterns which, when matched, mark a memory entry as readonly.
# Extends the list from the global configuration, merging the two lists.
read_only_memory_patterns: []

View File

@@ -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
View 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
View 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

View 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:

View File

@@ -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:

View File

@@ -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: