12 Commits

Author SHA1 Message Date
revlis44
745c5a7461 harbor로그인 시 비밀번호 특수문자가 있으면 printf %s 사용해야함
All checks were successful
PR-CI / build-test (pull_request) Successful in 17s
2025-12-09 13:30:51 +09:00
revlis44
a586ba28bd harbor 2025-12-09 12:11:34 +09:00
revlis44
7b47a02d9a ddd
All checks were successful
PR-CI / build-test (pull_request) Successful in 33s
2025-12-09 12:09:19 +09:00
revlis44
7fb2bfdfa4 dd 2025-12-09 12:06:34 +09:00
revlis44
98a8159d9f d 2025-12-09 12:05:22 +09:00
632eaa721e favicon 강제 캐쉬
Some checks failed
Main-Build / build-and-push (push) Failing after 17s
2025-12-09 11:58:08 +09:00
b6ab357703 favicon 강제 캐쉬
Some checks failed
Main-Build / build-and-push (push) Failing after 16s
2025-12-09 11:49:01 +09:00
8fca06fcbc favicon 강제 캐쉬
Some checks failed
Main-Build / build-and-push (push) Failing after 15s
2025-12-09 11:43:21 +09:00
53887b77ed Merge pull request '파비콘 추가' (#14) from feature/favicon into master
Some checks failed
Main-Build / build-and-push (push) Failing after 16s
Reviewed-on: #14
Reviewed-by: saydev <gomdobi@sayinfo.co.kr>
2025-12-09 02:07:25 +00:00
revlis44
2808bbc29d 파비콘 추가
Some checks failed
PR-CI / build-test (pull_request) Failing after 4m55s
2025-12-09 11:06:54 +09:00
fc1420a0ea Merge pull request 'favicon 변경' (#13) from feature/favicon into master
Some checks failed
Main-Build / build-and-push (push) Failing after 28s
Reviewed-on: #13
Reviewed-by: saydev <gomdobi@sayinfo.co.kr>
2025-12-09 01:55:45 +00:00
revlis44
ea2ecf2539 favicon 변경
Some checks failed
PR-CI / build-test (pull_request) Failing after 6m30s
2025-12-09 10:29:00 +09:00
11 changed files with 26 additions and 62 deletions

View File

@@ -2,55 +2,30 @@ name: Main-Build
on:
push:
branches: ["master"]
branches: ["master"]
jobs:
build-and-push:
runs-on: ubuntu-latest
container:
image: ci-maven-node:1.0
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up JDK 8
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: "8"
- uses: actions/checkout@v4
- name: Maven Build WAR
run: mvn -B clean package -DskipTests
# ------------------------------
# 🔻 Harbor 관련 기능 임시 비활성화
# ------------------------------
# - name: Docker login to Harbor
# run: |
# echo "${{ secrets.HARBOR_PASSWORD }}" | docker login harbor.sayinfo.co.kr -u ${{ secrets.HARBOR_USERNAME }} --password-stdin
# - name: Build Docker image
# run: |
# docker build -t sayit-helpdesk:latest .
# - name: Tag image for Harbor
# run: |
# docker tag sayit-helpdesk:latest harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest
# - name: Push image to Harbor
# run: |
# docker push harbor.sayinfo.co.kr/helpdesk/helpdesk-service:latest
# ------------------------------
# 끝 (Harbor 비활성화)
# ------------------------------
- name: Build Docker image (local only, no push)
- name: Login Harbor
run: |
docker build -t sayit-helpdesk:local-test .
printf "%s" "$HARBOR_PASSWORD" | docker login harbor.sayinfo.co.kr -u "$HARBOR_USERNAME" --password-stdin
env:
HARBOR_USERNAME: ${{ secrets.HARBOR_USERNAME }}
HARBOR_PASSWORD: ${{ secrets.HARBOR_PASSWORD }}
- name: Done
run: echo "Main branch build completed (Harbor push disabled)."
- name: Build Docker image
run: |
docker build -t sayit-helpdesk:latest .
- name: Push to Harbor
run: |
docker tag sayit-helpdesk:latest harbor.sayinfo.co.kr/sayit-helpdesk-gitea_action_runner_test/helpdesk-service:latest
docker push harbor.sayinfo.co.kr/sayit-helpdesk-gitea_action_runner_test/helpdesk-service:latest

View File

@@ -2,33 +2,15 @@ name: PR-CI
on:
pull_request:
types: [opened, synchronize] # PR 생성 + 커밋 push 때만 실행
branches: ["master"]
types: [opened, synchronize]
branches: ["master"]
jobs:
build-test:
runs-on: ubuntu-latest
container:
image: ci-maven-node:1.0
steps:
- name: Checkout source
uses: actions/checkout@v4
- uses: actions/checkout@v4
- name: Set up JDK 8
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: "8"
- name: Cache Maven repo
uses: actions/cache@v4
with:
path: ~/.m2
key: m2-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
restore-keys: |
m2-${{ runner.os }}-
- name: Maven Build (compile + dependency check)
- name: Maven Build (skip tests)
run: mvn -B clean package -DskipTests

BIN
src/main/webapp/Favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@@ -17,6 +17,7 @@
<script src="js/common/login.js"></script>
<base target="_self" />
<title><%=MainGlobals.SITE_TITLE%></title>
<link rel="icon" type="image/x-icon" href="${pageContext.request.contextPath}/Favicon.ico?v=20251209" />
<style>
.login_wrap_body{ background:url(${pageContext.request.contextPath}/images/admin/login_bg.gif) repeat left top; font-family:"맑은 고딕",Malgun Gothic,AppleGothic,sans-serif,"돋움", Dotum; }
.login_wrap{display:block; height:100%; left:0; position:fixed; top:0; width:100%; z-index:10000;}

View File

@@ -12,6 +12,7 @@
<meta name="keywords" content="" />
<base target="_self" />
<title><%=MainGlobals.SITE_TITLE%></title>
<link rel="icon" type="image/x-icon" href="${pageContext.request.contextPath}/Favicon.ico?v=20251209" />
<script type="text/javascript">var G_CONTEXT_PATH = '${pageContext.request.contextPath}';</script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/engine.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>

View File

@@ -22,6 +22,7 @@ if(UserHelper.isAuthenticated()) {
<meta name="keywords" content="" />
<base target="_self" />
<title><%=MainGlobals.SITE_TITLE%></title>
<link rel="icon" type="image/x-icon" href="${pageContext.request.contextPath}/Favicon.ico?v=20251209" />
<script type="text/javascript">var G_CONTEXT_PATH = '${pageContext.request.contextPath}';</script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/engine.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>

View File

@@ -23,6 +23,7 @@ if(UserHelper.isAuthenticated()) {
<meta name="keywords" content="" />
<base target="_self" />
<title><%=MainGlobals.SITE_TITLE%></title>
<link rel="icon" type="image/x-icon" href="${pageContext.request.contextPath}/Favicon.ico?v=20251209" />
<script type="text/javascript">var G_CONTEXT_PATH = '${pageContext.request.contextPath}';</script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/engine.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>

View File

@@ -22,6 +22,7 @@ if(UserHelper.isAuthenticated()) {
<meta name="keywords" content="" />
<base target="_self" />
<title><%=MainGlobals.SITE_TITLE%></title>
<link rel="icon" type="image/x-icon" href="${pageContext.request.contextPath}/Favicon.ico?v=20251209" />
<script type="text/javascript">var G_CONTEXT_PATH = '${pageContext.request.contextPath}';</script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/engine.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>

View File

@@ -13,6 +13,7 @@
<meta name="keywords" content="noframe" />
<base target="_self" />
<title><%=MainGlobals.SITE_TITLE%></title>
<link rel="icon" type="image/x-icon" href="${pageContext.request.contextPath}/Favicon.ico?v=20251209" />
<script type="text/javascript">var G_CONTEXT_PATH = "${pageContext.request.contextPath}";</script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/engine.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>

View File

@@ -22,6 +22,7 @@ if(UserHelper.isAuthenticated()) {
<meta name="keywords" content="" />
<base target="_self" />
<title><%=MainGlobals.SITE_TITLE%></title>
<link rel="icon" type="image/x-icon" href="${pageContext.request.contextPath}/Favicon.ico?v=20251209" />
<script type="text/javascript">var G_CONTEXT_PATH = '${pageContext.request.contextPath}';</script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/engine.js"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB