diff --git a/.gitea/workflows/main-build.yml b/.gitea/workflows/main-build.yml index bd65ffc..0e8ff95 100644 --- a/.gitea/workflows/main-build.yml +++ b/.gitea/workflows/main-build.yml @@ -7,16 +7,12 @@ on: jobs: build-and-push: runs-on: ubuntu-latest - - container: - image: ci-maven-node:1.0 - options: >- - --add-host nexus.sayinfo.co.kr:192.168.0.210 + steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 8 + - name: Set up Java 8 uses: actions/setup-java@v4 with: distribution: temurin @@ -25,33 +21,22 @@ jobs: - 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: Docker login to Harbor run: | - docker build -t sayit-helpdesk:local-test . + 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/gitea_action_runner_test/helpdesk-service:latest + + - name: Push image to Harbor + run: | + docker push harbor.sayinfo.co.kr/gitea_action_runner_test/helpdesk-service:latest - name: Done - run: echo "Main branch build completed (Harbor push disabled)." + run: echo "Main branch build + Harbor push completed." diff --git a/.gitea/workflows/pr-ci.yml b/.gitea/workflows/pr-ci.yml index 7b5a423..b8afe47 100644 --- a/.gitea/workflows/pr-ci.yml +++ b/.gitea/workflows/pr-ci.yml @@ -2,23 +2,18 @@ name: PR-CI on: pull_request: - types: [opened, synchronize] # PR 생성 + 컀밋 push λ•Œλ§Œ μ‹€ν–‰ + types: [opened, synchronize] branches: ["master"] jobs: build-test: runs-on: ubuntu-latest - container: - image: ci-maven-node:1.0 - options: >- - --add-host nexus.sayinfo.co.kr:192.168.0.210 - steps: - - name: Checkout source + - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 8 + - name: Set up Java 8 uses: actions/setup-java@v4 with: distribution: temurin @@ -32,5 +27,5 @@ jobs: restore-keys: | m2-${{ runner.os }}- - - name: Maven Build (compile + dependency check) + - name: Maven Build run: mvn -B clean package -DskipTests