Compare commits
8 Commits
539fb8aa61
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 67f5d815c9 | |||
| f3e97d6c44 | |||
| 126c0169aa | |||
| 8770b1b47b | |||
| dbcda9dd6b | |||
| 1d21d4b49b | |||
| c8dbaf167f | |||
| 0e9e5b0283 |
+3
-5
@@ -6,10 +6,12 @@
|
||||
|
||||
# PostgreSQL
|
||||
DB_PORT=5432
|
||||
DB_HOST=postgres
|
||||
DB_HOST=db
|
||||
DB_USER=
|
||||
DB_PASSWORD=
|
||||
DB_NAME=report_db
|
||||
# DB 데이터 저장 경로 (프로젝트 폴더 기준 상대 경로, 기본값 ./data/postgres)
|
||||
DB_DATA_DIR=./data/postgres
|
||||
|
||||
# Admin Account
|
||||
ADMIN_USER=
|
||||
@@ -21,7 +23,3 @@ REFRESH_SECRET=
|
||||
|
||||
# Gemini API Key
|
||||
JEMINI_KEY=
|
||||
|
||||
# Ports
|
||||
BACKEND_PORT=54530
|
||||
FRONTEND_PORT=55110
|
||||
|
||||
@@ -43,7 +43,10 @@ jobs:
|
||||
- name: Restart containers
|
||||
run: |
|
||||
cd "$DEPLOY_DIR"
|
||||
docker compose up -d
|
||||
docker compose up -d --remove-orphans
|
||||
# backend/frontend는 항상 새로 기동: DB 교체 시 스키마 재동기화,
|
||||
# nginx의 낡은 upstream IP 캐시 방지
|
||||
docker compose up -d --no-deps --force-recreate backend frontend
|
||||
|
||||
- name: Prune dangling images
|
||||
run: docker image prune -f
|
||||
|
||||
@@ -12,6 +12,9 @@ dist/
|
||||
# Uploads / generated assets
|
||||
backend/img/
|
||||
|
||||
# DB data (bind mount)
|
||||
data/
|
||||
|
||||
# Logs & OS files
|
||||
*.log
|
||||
.DS_Store
|
||||
|
||||
+17
-6
@@ -20,7 +20,7 @@ const PORT = process.env.PORT || 3000;
|
||||
const sequelize = new Sequelize(
|
||||
process.env.DB_NAME || "report_db",
|
||||
process.env.DB_USER || "postgres",
|
||||
process.env.DB_PASSWORD || "password",
|
||||
process.env.DB_PASSWORD,
|
||||
{
|
||||
host: process.env.DB_HOST || "localhost",
|
||||
port: process.env.DB_PORT || 5432,
|
||||
@@ -86,8 +86,12 @@ const swaggerOptions = {
|
||||
const swaggerDocs = swaggerJsdoc(swaggerOptions);
|
||||
app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerDocs));
|
||||
|
||||
const ACCESS_SECRET = process.env.ACCESS_SECRET || "access_secret_123";
|
||||
const REFRESH_SECRET = process.env.REFRESH_SECRET || "refresh_secret_123";
|
||||
const ACCESS_SECRET = process.env.ACCESS_SECRET;
|
||||
const REFRESH_SECRET = process.env.REFRESH_SECRET;
|
||||
if (!ACCESS_SECRET || !REFRESH_SECRET) {
|
||||
console.error("ACCESS_SECRET / REFRESH_SECRET 환경변수가 필요합니다.");
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
// OpenAI 추가
|
||||
const { OpenAI } = require("openai");
|
||||
@@ -215,8 +219,12 @@ sequelize
|
||||
.then(async () => {
|
||||
console.log("DB Tables Synced...");
|
||||
// 초기 관리자 계정 생성 (환경 변수 기반)
|
||||
const adminUser = process.env.ADMIN_USER || "admin";
|
||||
const adminPass = process.env.ADMIN_PASS || "admin123!";
|
||||
const adminUser = process.env.ADMIN_USER;
|
||||
const adminPass = process.env.ADMIN_PASS;
|
||||
if (!adminUser || !adminPass) {
|
||||
console.log("ADMIN_USER/ADMIN_PASS 미설정 - 관리자 계정 생성을 건너뜁니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
const adminExists = await User.findOne({ where: { username: adminUser } });
|
||||
const hashedPassword = await bcrypt.hash(adminPass, 10);
|
||||
@@ -240,7 +248,10 @@ sequelize
|
||||
);
|
||||
}
|
||||
})
|
||||
.catch((err) => console.log("PostgreSQL Connection/Sync Error:", err));
|
||||
.catch((err) => {
|
||||
console.error("PostgreSQL Connection/Sync Error:", err);
|
||||
process.exit(1);
|
||||
});
|
||||
|
||||
// Auth Middleware
|
||||
const authenticateToken = (req, res, next) => {
|
||||
|
||||
+26
-24
@@ -1,20 +1,20 @@
|
||||
services:
|
||||
postgres:
|
||||
db:
|
||||
image: postgres:16-alpine
|
||||
container_name: report-db
|
||||
restart: always
|
||||
environment:
|
||||
POSTGRES_DB: ${DB_NAME:-report_db}
|
||||
POSTGRES_USER: ${DB_USER:-postgres}
|
||||
POSTGRES_PASSWORD: ${DB_PASSWORD:-daoblock12!!}
|
||||
ports:
|
||||
- "5442:5432"
|
||||
POSTGRES_PASSWORD: ${DB_PASSWORD:?DB_PASSWORD가 .env에 설정되어야 합니다}
|
||||
expose:
|
||||
- "5432"
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql/data
|
||||
- ${DB_DATA_DIR:-./data/postgres}:/var/lib/postgresql/data
|
||||
networks:
|
||||
- report-network
|
||||
- app-network
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-postgres} -d ${DB_NAME:-report_db}"]
|
||||
test: [ "CMD-SHELL", "pg_isready -U ${DB_USER:-postgres} -d ${DB_NAME:-report_db}" ]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 20
|
||||
@@ -24,41 +24,43 @@ services:
|
||||
build: ./backend
|
||||
container_name: report-backend
|
||||
restart: always
|
||||
ports:
|
||||
- "${BACKEND_PORT:-54530}:3000"
|
||||
expose:
|
||||
- "3000"
|
||||
environment:
|
||||
- DB_HOST=${DB_HOST:-postgres}
|
||||
- DB_HOST=${DB_HOST:-db}
|
||||
- DB_PORT=${DB_PORT:-5432}
|
||||
- DB_USER=${DB_USER:-postgres}
|
||||
- DB_PASSWORD=${DB_PASSWORD:-daoblock12!!}
|
||||
- DB_PASSWORD=${DB_PASSWORD:?DB_PASSWORD가 .env에 설정되어야 합니다}
|
||||
- DB_NAME=${DB_NAME:-report_db}
|
||||
- ACCESS_SECRET=${ACCESS_SECRET:-your_jwt_access_secret_123}
|
||||
- REFRESH_SECRET=${REFRESH_SECRET:-your_jwt_refresh_secret_123}
|
||||
- ADMIN_USER=${ADMIN_USER:-kyeongmi}
|
||||
- ADMIN_PASS=${ADMIN_PASS:-kyeongmi}
|
||||
- ACCESS_SECRET=${ACCESS_SECRET:?ACCESS_SECRET이 .env에 설정되어야 합니다}
|
||||
- REFRESH_SECRET=${REFRESH_SECRET:?REFRESH_SECRET이 .env에 설정되어야 합니다}
|
||||
- ADMIN_USER=${ADMIN_USER:?ADMIN_USER가 .env에 설정되어야 합니다}
|
||||
- ADMIN_PASS=${ADMIN_PASS:?ADMIN_PASS가 .env에 설정되어야 합니다}
|
||||
- JEMINI_KEY=${JEMINI_KEY}
|
||||
depends_on:
|
||||
postgres:
|
||||
db:
|
||||
condition: service_healthy
|
||||
volumes:
|
||||
- ./backend/img:/app/img
|
||||
networks:
|
||||
- report-network
|
||||
- app-network
|
||||
- proxy
|
||||
|
||||
frontend:
|
||||
build: ./frontend
|
||||
container_name: report-frontend
|
||||
restart: always
|
||||
ports:
|
||||
- "${FRONTEND_PORT:-55110}:80"
|
||||
expose:
|
||||
- "80"
|
||||
depends_on:
|
||||
- backend
|
||||
networks:
|
||||
- report-network
|
||||
- app-network
|
||||
- proxy
|
||||
|
||||
networks:
|
||||
report-network:
|
||||
app-network:
|
||||
driver: bridge
|
||||
|
||||
volumes:
|
||||
postgres-data:
|
||||
# npm(Nginx Proxy Manager)이 컨테이너 이름으로 라우팅하는 공용 네트워크
|
||||
proxy:
|
||||
external: true
|
||||
|
||||
Reference in New Issue
Block a user