From 6963152e972af3bdbb5d33e28ca508a44d1f7da6 Mon Sep 17 00:00:00 2001 From: Claude Code Date: Fri, 26 Jun 2026 17:13:12 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=ED=91=9C=EC=8B=9C=20=EB=B0=8F=20=ED=8F=AC?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### 버전 정보 표시 기능 - CI/CD에서 빌드 시간과 git commit hash를 version.txt에 기록 - Web과 Admin 앱이 시작 시 version.txt를 읽어 VersionInfo 싱글톤으로 등록 - 홈페이지 푸터에 "버전: <커밋해시> | 배포: <빌드시간>" 표시 - 최신 소스 반영 여부를 즉시 확인 가능 ### 포트 충돌 해결 - 배포 후 기존 프로세스 종료 시 포트 릴리스 대기 로직 추가 - lsof 명령으로 포트 사용 여부 확인 (최대 30초 대기) - 5001/5002 포트가 완전히 릴리스될 때까지 new process 시작 지연 - "Address already in use" 오류 해결 파일 변경: - .gitea/workflows/deploy.yml: 버전 파일 생성 + 포트 대기 로직 - TaxBaik.Web/Program.cs: version.txt 읽기 + VersionInfo 등록 - TaxBaik.Admin/Program.cs: version.txt 읽기 + VersionInfo 등록 - TaxBaik.Web/Pages/Shared/_Footer.cshtml: 버전 정보 표시 - TaxBaik.Web/VersionInfo.cs: 새로 추가 - TaxBaik.Admin/VersionInfo.cs: 새로 추가 Co-Authored-By: Claude Haiku 4.5 --- .gitea/workflows/deploy.yml | 31 +++++++++++++++++++++++-- TaxBaik.Admin/Program.cs | 16 +++++++++++++ TaxBaik.Admin/VersionInfo.cs | 7 ++++++ TaxBaik.Web/Pages/Shared/_Footer.cshtml | 5 ++++ TaxBaik.Web/Program.cs | 16 +++++++++++++ TaxBaik.Web/VersionInfo.cs | 7 ++++++ 6 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 TaxBaik.Admin/VersionInfo.cs create mode 100644 TaxBaik.Web/VersionInfo.cs diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index db25ff1..cfe2379 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -35,6 +35,21 @@ jobs: cp -r db/migrations ./publish/web/migrations || true cp -r db/migrations ./publish/admin/migrations || true + - name: Generate build info + run: | + COMMIT_HASH=$(git rev-parse --short HEAD) + BUILD_TIME=$(date -u +'%Y-%m-%d %H:%M:%S UTC') + echo "COMMIT_HASH=$COMMIT_HASH" >> $GITHUB_ENV + echo "BUILD_TIME=$BUILD_TIME" >> $GITHUB_ENV + cat > ./publish/web/wwwroot/version.txt < ./publish/admin/wwwroot/version.txt </dev/null 2>&1; then + break + fi + sleep 1 + done cd ~/taxbaik_active export ConnectionStrings__Default="Host=localhost;Database=taxbaikdb;Username=taxbaik;Password=taxbaik123" export ASPNETCORE_ENVIRONMENT=Production @@ -73,7 +94,13 @@ jobs: tar -xzf /tmp/admin_publish.tar.gz -C "$ADMIN_DEPLOY_DIR" ln -sfn "$ADMIN_DEPLOY_DIR/admin" ~/taxbaik_admin_active pkill -f "TaxBaik.Admin" || true - sleep 2 + # Wait for port 5002 to be released + for i in {1..30}; do + if ! lsof -Pi :5002 -sTCP:LISTEN -t >/dev/null 2>&1; then + break + fi + sleep 1 + done cd ~/taxbaik_admin_active export ConnectionStrings__Default="Host=localhost;Database=taxbaikdb;Username=taxbaik;Password=taxbaik123" export ASPNETCORE_ENVIRONMENT=Production diff --git a/TaxBaik.Admin/Program.cs b/TaxBaik.Admin/Program.cs index 93b7bb1..45ce4c4 100644 --- a/TaxBaik.Admin/Program.cs +++ b/TaxBaik.Admin/Program.cs @@ -20,6 +20,22 @@ builder.Services.AddMemoryCache(); builder.Services.AddInfrastructure(); builder.Services.AddApplication(); +// Register version info +var versionInfo = new VersionInfo(); +var versionFilePath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "version.txt"); +if (File.Exists(versionFilePath)) +{ + var lines = File.ReadAllLines(versionFilePath); + foreach (var line in lines) + { + if (line.StartsWith("Version:")) + versionInfo.Version = line.Substring("Version:".Length).Trim(); + else if (line.StartsWith("Built:")) + versionInfo.Built = line.Substring("Built:".Length).Trim(); + } +} +builder.Services.AddSingleton(versionInfo); + var app = builder.Build(); // Run migrations on startup diff --git a/TaxBaik.Admin/VersionInfo.cs b/TaxBaik.Admin/VersionInfo.cs new file mode 100644 index 0000000..0fb1715 --- /dev/null +++ b/TaxBaik.Admin/VersionInfo.cs @@ -0,0 +1,7 @@ +namespace TaxBaik.Admin; + +public class VersionInfo +{ + public string Version { get; set; } = "unknown"; + public string Built { get; set; } = "unknown"; +} diff --git a/TaxBaik.Web/Pages/Shared/_Footer.cshtml b/TaxBaik.Web/Pages/Shared/_Footer.cshtml index 0d3c4dc..76ee8ca 100644 --- a/TaxBaik.Web/Pages/Shared/_Footer.cshtml +++ b/TaxBaik.Web/Pages/Shared/_Footer.cshtml @@ -1,3 +1,5 @@ +@inject VersionInfo VersionInfo + diff --git a/TaxBaik.Web/Program.cs b/TaxBaik.Web/Program.cs index 3a392c9..0fed1b9 100644 --- a/TaxBaik.Web/Program.cs +++ b/TaxBaik.Web/Program.cs @@ -13,6 +13,22 @@ builder.Services.AddResponseCompression(opts => { builder.Services.AddInfrastructure(); builder.Services.AddApplication(); +// Register version info +var versionInfo = new VersionInfo(); +var versionFilePath = Path.Combine(AppContext.BaseDirectory, "wwwroot", "version.txt"); +if (File.Exists(versionFilePath)) +{ + var lines = File.ReadAllLines(versionFilePath); + foreach (var line in lines) + { + if (line.StartsWith("Version:")) + versionInfo.Version = line.Substring("Version:".Length).Trim(); + else if (line.StartsWith("Built:")) + versionInfo.Built = line.Substring("Built:".Length).Trim(); + } +} +builder.Services.AddSingleton(versionInfo); + var app = builder.Build(); // Run migrations on startup diff --git a/TaxBaik.Web/VersionInfo.cs b/TaxBaik.Web/VersionInfo.cs new file mode 100644 index 0000000..f1525fa --- /dev/null +++ b/TaxBaik.Web/VersionInfo.cs @@ -0,0 +1,7 @@ +namespace TaxBaik.Web; + +public class VersionInfo +{ + public string Version { get; set; } = "unknown"; + public string Built { get; set; } = "unknown"; +}