Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPS-121] 어드민 API 추가 #114

Merged
merged 11 commits into from
Mar 24, 2025
Merged

[SPS-121] 어드민 API 추가 #114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5e33f6d
feat: admin domain repository 추가 및 구현
big-cir Mar 11, 2025
74840f6
feat: 로그인 security 추가
big-cir Mar 11, 2025
5409574
feat: 어드민 API 추가
big-cir Mar 11, 2025
4d454e4
chore: dockerfile 추가 및 deploy.yml 수정
big-cir Mar 11, 2025
28a0b6d
chore: deploy.yml 수정
big-cir Mar 11, 2025
4fb343d
feat: 암장 난이도 개수 표시 view 추가
big-cir Mar 11, 2025
3d68d70
feat: hex code 색상 표시 view 추가
big-cir Mar 11, 2025
bcb43d1
feat: 트랜잭션 어노테이션 추가
big-cir Mar 12, 2025
8cbfd8c
refactor: 변경된 도메인에 맞춰 리팩토링
big-cir Mar 22, 2025
2639853
Merge branch 'develop' into feature/SPS-121/add_admin_system
big-cir Mar 23, 2025
9851b60
Merge branch 'develop' into feature/SPS-121/add_admin_system
big-cir Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: dockerfile 추가 및 deploy.yml 수정
  • Loading branch information
@big-cir
big-cir committed Mar 22, 2025
commit 4d454e40050f3835b6176beaf16103e9443bd4e7
21 changes: 13 additions & 8 deletions .github/workflows/dev-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,21 @@ jobs:
java-version: '21'

- name: Build with Gradle (skip tests)
run: ./gradlew build -x test
run: ./gradlew :clog-api:build :clog-admin:build -x test

- name: Build Docker Image
- name: Build API Docker Image
run: |
docker build -f clog-api/Dockerfile -t ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_IMAGE }}:${{ github.ref_name }} .
docker build -f clog-api/Dockerfile -t ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_API_IMAGE }}:${{ github.ref_name }} .

- name: Login to Docker Registry
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login ${{ secrets.DOCKER_REGISTRY }} -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
- name: Push API Docker Image
run: docker push ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_API_IMAGE }}:${{ github.ref_name }}

- name: Push Docker Image
run: docker push ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_IMAGE }}:${{ github.ref_name }}
- name: Build Admin Docker Image
run: |
docker build -f clog-admin/Dockerfile -t ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_ADMIN_IMAGE }}:${{ github.ref_name }} .

- name: Push Admin Docker Image
run: docker push ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_ADMIN_IMAGE }}:${{ github.ref_name }}

- name: Deploy on Remote Server via SSH
uses: appleboy/ssh-action@v0.1.8
Expand All @@ -42,4 +46,5 @@ jobs:
port: ${{ secrets.SSH_PORT }}
script: |
docker compose -f /root/docker-compose.yml pull api
docker compose -f /root/docker-compose.yml up -d api
docker compose -f /root/docker-compose.yml pull admin
docker compose -f /root/docker-compose.yml up -d api admin
7 changes: 7 additions & 0 deletions clog-admin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM openjdk:21-slim

WORKDIR /data/www

COPY clog-admin/build/libs/*.jar admin.jar

ENTRYPOINT ["java", "-jar", "admin.jar"]