Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
70 changes: 70 additions & 0 deletions .github/workflows/release-blue-green.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: AWS EC2 Deploy

on:
push:
branches:
- main

jobs:
build:
# ubuntu 버전 지정
runs-on: ubuntu-22.04
steps:
# Checkout 진행
- uses: actions/checkout@v3

# JDK 17 설치
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'corretto'

# Gradle 캐싱
- name: Gradle Caching
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

# Gradle 권한 부여
- name: Grant execute permission for gradlew
run: chmod +x gradlew

# application.yml 반영
- name: Make application.yml
run: |
cd ./src/main/resources
touch ./application.yml
echo "${{ secrets.APPLICATION_SECRET}}" > ./application.yml
shell: bash

# Gradle BootJar
- name: BootJar with Gradle
run: ./gradlew clean bootJar -Dspring.profiles.active=release

# Docker Image Push
- name: Docker Image push
run: |
docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
docker build -t ${{ secrets.DOCKERHUB_USERNAME}}/${{ secrets.DOCKERHUB_REPOSITORY}} ./
docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY}}

# Docker Compose
- name: Docker Compose
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.EC2_SERVER_IP }}
username: ${{ secrets.SSH_USERNAME }}
key: ${{ secrets.SSH_PRIVATE_KEY }}
script: |
sudo docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY}}
sudo docker tag ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY}} ${{ secrets.DOCKER_IMAGE_NAME }}
cd ~
sudo chmod +x deploy.sh
./deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class AuthController {
@PostMapping("/sign-in")
public ApplicationResponse<LoginRes> signIn(@RequestParam(name = "code") String code,
@RequestParam(name = "redirect-uri") String redirectUri,
@RequestParam(name = "type") String type) {
@RequestParam(name = "type", required = false, defaultValue = "KAKAO") String type) {
return ApplicationResponse.ok(authService.signIn(code, redirectUri,type));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public LoginRes signIn(String code, String redirectUri, String type) {
case KAKAO -> kakaoMember(code, redirectUri);
case GOOGLE -> googleMember(code, redirectUri);
case NAVER -> naverMember(code, redirectUri);
default -> null;
default -> kakaoMember(code, redirectUri);
};

assert member != null;
Expand Down