Compare commits
8 Commits
53887b77ed
...
feature/gi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
745c5a7461 | ||
|
|
a586ba28bd | ||
|
|
7b47a02d9a | ||
|
|
7fb2bfdfa4 | ||
|
|
98a8159d9f | ||
| 632eaa721e | |||
| b6ab357703 | |||
| 8fca06fcbc |
@@ -2,55 +2,30 @@ name: Main-Build
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: ["master"]
|
branches: ["master"]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push:
|
build-and-push:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
container:
|
|
||||||
image: ci-maven-node:1.0
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- 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: Maven Build WAR
|
- name: Maven Build WAR
|
||||||
run: mvn -B clean package -DskipTests
|
run: mvn -B clean package -DskipTests
|
||||||
|
|
||||||
# ------------------------------
|
- name: Login Harbor
|
||||||
# 🔻 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)
|
|
||||||
run: |
|
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
|
- name: Build Docker image
|
||||||
run: echo "Main branch build completed (Harbor push disabled)."
|
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
|
||||||
|
|||||||
@@ -2,33 +2,15 @@ name: PR-CI
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request:
|
pull_request:
|
||||||
types: [opened, synchronize] # PR 생성 + 커밋 push 때만 실행
|
types: [opened, synchronize]
|
||||||
branches: ["master"]
|
branches: ["master"]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-test:
|
build-test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
container:
|
|
||||||
image: ci-maven-node:1.0
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout source
|
- uses: actions/checkout@v4
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up JDK 8
|
- name: Maven Build (skip tests)
|
||||||
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)
|
|
||||||
run: mvn -B clean package -DskipTests
|
run: mvn -B clean package -DskipTests
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
<script src="js/common/login.js"></script>
|
<script src="js/common/login.js"></script>
|
||||||
<base target="_self" />
|
<base target="_self" />
|
||||||
<title><%=MainGlobals.SITE_TITLE%></title>
|
<title><%=MainGlobals.SITE_TITLE%></title>
|
||||||
|
<link rel="icon" type="image/x-icon" href="${pageContext.request.contextPath}/Favicon.ico?v=20251209" />
|
||||||
<style>
|
<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_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;}
|
.login_wrap{display:block; height:100%; left:0; position:fixed; top:0; width:100%; z-index:10000;}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
<meta name="keywords" content="" />
|
<meta name="keywords" content="" />
|
||||||
<base target="_self" />
|
<base target="_self" />
|
||||||
<title><%=MainGlobals.SITE_TITLE%></title>
|
<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">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/engine.js"></script>
|
||||||
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ if(UserHelper.isAuthenticated()) {
|
|||||||
<meta name="keywords" content="" />
|
<meta name="keywords" content="" />
|
||||||
<base target="_self" />
|
<base target="_self" />
|
||||||
<title><%=MainGlobals.SITE_TITLE%></title>
|
<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">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/engine.js"></script>
|
||||||
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ if(UserHelper.isAuthenticated()) {
|
|||||||
<meta name="keywords" content="" />
|
<meta name="keywords" content="" />
|
||||||
<base target="_self" />
|
<base target="_self" />
|
||||||
<title><%=MainGlobals.SITE_TITLE%></title>
|
<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">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/engine.js"></script>
|
||||||
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ if(UserHelper.isAuthenticated()) {
|
|||||||
<meta name="keywords" content="" />
|
<meta name="keywords" content="" />
|
||||||
<base target="_self" />
|
<base target="_self" />
|
||||||
<title><%=MainGlobals.SITE_TITLE%></title>
|
<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">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/engine.js"></script>
|
||||||
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
<meta name="keywords" content="noframe" />
|
<meta name="keywords" content="noframe" />
|
||||||
<base target="_self" />
|
<base target="_self" />
|
||||||
<title><%=MainGlobals.SITE_TITLE%></title>
|
<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">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/engine.js"></script>
|
||||||
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ if(UserHelper.isAuthenticated()) {
|
|||||||
<meta name="keywords" content="" />
|
<meta name="keywords" content="" />
|
||||||
<base target="_self" />
|
<base target="_self" />
|
||||||
<title><%=MainGlobals.SITE_TITLE%></title>
|
<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">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/engine.js"></script>
|
||||||
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
<script type="text/javascript" src="${pageContext.request.contextPath}/dwr/util.js"></script>
|
||||||
|
|||||||
Reference in New Issue
Block a user