diff --git a/.github/workflows/PROD-CD.yml b/.github/workflows/PROD-CD.yml new file mode 100644 index 00000000..74891ec3 --- /dev/null +++ b/.github/workflows/PROD-CD.yml @@ -0,0 +1,69 @@ +name: CD + +on: + pull_request: + branches: [ "develop" ] + +jobs: + deploy-ci: + runs-on: ubuntu-22.04 + env: + working-directory: . + + + steps: + - name: 체크아웃 + uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'corretto' + java-version: '17' + + - name: application.yaml 생성 + run: | + mkdir ./module-api/src/main/resources + cd ./module-api/src/main/resources + touch ./application.yml + echo "${{ secrets.PROD_APPLICATION }}" > ./application.yml + cat ./application.yml + working-directory: ${{ env.working-directory }} + + - name: 빌드 + run: | + chmod +x gradlew + ./gradlew build -x test + working-directory: ${{ env.working-directory }} + shell: bash + + + - name: docker build 환경 설정 + uses: docker/setup-buildx-action@v2.9.1 + + - name: login docker hub + uses: docker/login-action@v2.2.0 + with: + username: ${{ secrets.DOCKER_USER }} + password: ${{ secrets.DOCKER_SECRET }} + + - name: docker image 빌드 및 푸시 + run: | + docker build --platform linux/amd64 -t mile1217/mile-server . + docker push mile1217/mile-server + working-directory: ${{ env.working-directory }} + + deploy-cd: + needs: deploy-ci + runs-on: ubuntu-22.04 + + steps: + - name: 도커 컨테이너 실행 + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.PROD_SERVER_IP }} + username: ${{ secrets.PROD_SERVER_USER }} + key: ${{ secrets.PROD_SERVER_KEY }} + script: | + cd ~ + ./deploy.sh diff --git a/.gitignore b/.gitignore index 0221c5e1..e683fba5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,9 @@ .idea/ .DS_Store .gradle/ -module-api/build/libs/ - -module-common/build/libs/ - -module-domain/build/libs/ - +build/ module-api/build/ +module-common/build/ +module-domain/build/ +module-auth/build/ +module-api/src/main/resources/application.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..e182b7ee --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM amd64/amazoncorretto:17 +WORKDIR /app +COPY ./module-api/build/libs/module-api-1.0.0-SNAPSHOT.jar /app/MILE.jar +CMD ["java", "-Duser.timezone=Asia/Seoul", "-jar", "-Dspring.profiles.active=dev", "MILE.jar"] \ No newline at end of file diff --git a/build.gradle b/build.gradle index 40680eb6..a7e79488 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ subprojects { apply plugin: "io.spring.dependency-management" apply plugin: "java" - version = "1.0.7-SNAPSHOT" + version = "1.0.0-SNAPSHOT" sourceCompatibility = "17" repositories { diff --git a/build/libs/server-plain.jar b/build/libs/server-plain.jar deleted file mode 100644 index d475e858..00000000 Binary files a/build/libs/server-plain.jar and /dev/null differ diff --git a/build/resolvedMainClassName b/build/resolvedMainClassName deleted file mode 100644 index e69de29b..00000000 diff --git a/build/tmp/jar/MANIFEST.MF b/build/tmp/jar/MANIFEST.MF deleted file mode 100644 index 58630c02..00000000 --- a/build/tmp/jar/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/module-api/build.gradle b/module-api/build.gradle index c3d29c5a..6c9ba061 100644 --- a/module-api/build.gradle +++ b/module-api/build.gradle @@ -3,5 +3,7 @@ dependencies { implementation project(':module-common') compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' + implementation 'mysql:mysql-connector-java:8.0.33' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'org.springframework.boot:spring-boot-starter-actuator' } diff --git a/module-auth/build/classes/java/main/com/mile/external/client/kakao/KakaoApiClient.class b/module-auth/build/classes/java/main/com/mile/external/client/kakao/KakaoApiClient.class deleted file mode 100644 index 4d5b4b5f..00000000 Binary files a/module-auth/build/classes/java/main/com/mile/external/client/kakao/KakaoApiClient.class and /dev/null differ diff --git a/module-auth/build/libs/module-auth-1.0.7-SNAPSHOT-plain.jar b/module-auth/build/libs/module-auth-1.0.7-SNAPSHOT-plain.jar deleted file mode 100644 index c951e664..00000000 Binary files a/module-auth/build/libs/module-auth-1.0.7-SNAPSHOT-plain.jar and /dev/null differ diff --git a/module-auth/build/resolvedMainClassName b/module-auth/build/resolvedMainClassName deleted file mode 100644 index e69de29b..00000000 diff --git a/module-auth/build/tmp/compileJava/previous-compilation-data.bin b/module-auth/build/tmp/compileJava/previous-compilation-data.bin deleted file mode 100644 index 270ed41c..00000000 Binary files a/module-auth/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ diff --git a/module-auth/build/tmp/jar/MANIFEST.MF b/module-auth/build/tmp/jar/MANIFEST.MF deleted file mode 100644 index 58630c02..00000000 --- a/module-auth/build/tmp/jar/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/module-common/build/classes/java/main/com/mile/exception/message/ErrorMessage.class b/module-common/build/classes/java/main/com/mile/exception/message/ErrorMessage.class deleted file mode 100644 index b7557812..00000000 Binary files a/module-common/build/classes/java/main/com/mile/exception/message/ErrorMessage.class and /dev/null differ diff --git a/module-common/build/classes/java/main/com/mile/exception/message/SuccessMessage.class b/module-common/build/classes/java/main/com/mile/exception/message/SuccessMessage.class deleted file mode 100644 index daf76623..00000000 Binary files a/module-common/build/classes/java/main/com/mile/exception/message/SuccessMessage.class and /dev/null differ diff --git a/module-common/build/classes/java/main/com/mile/exception/model/MileException.class b/module-common/build/classes/java/main/com/mile/exception/model/MileException.class deleted file mode 100644 index 5a2e932c..00000000 Binary files a/module-common/build/classes/java/main/com/mile/exception/model/MileException.class and /dev/null differ diff --git a/module-common/build/resolvedMainClassName b/module-common/build/resolvedMainClassName deleted file mode 100644 index e69de29b..00000000 diff --git a/module-common/build/tmp/compileJava/previous-compilation-data.bin b/module-common/build/tmp/compileJava/previous-compilation-data.bin deleted file mode 100644 index bb75741f..00000000 Binary files a/module-common/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ diff --git a/module-common/build/tmp/jar/MANIFEST.MF b/module-common/build/tmp/jar/MANIFEST.MF deleted file mode 100644 index 58630c02..00000000 --- a/module-common/build/tmp/jar/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/module-domain/build/classes/java/main/com/mile/comment/domain/Comment.class b/module-domain/build/classes/java/main/com/mile/comment/domain/Comment.class deleted file mode 100644 index 52e1db6e..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/comment/domain/Comment.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/comment/service/CommentService.class b/module-domain/build/classes/java/main/com/mile/comment/service/CommentService.class deleted file mode 100644 index 0f4110ba..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/comment/service/CommentService.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/config/BaseTimeEntity.class b/module-domain/build/classes/java/main/com/mile/config/BaseTimeEntity.class deleted file mode 100644 index c4566ec6..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/config/BaseTimeEntity.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/config/JpaAuditingConfig.class b/module-domain/build/classes/java/main/com/mile/config/JpaAuditingConfig.class deleted file mode 100644 index 1a86a94e..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/config/JpaAuditingConfig.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/curious/domain/Curious.class b/module-domain/build/classes/java/main/com/mile/curious/domain/Curious.class deleted file mode 100644 index abb1628c..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/curious/domain/Curious.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/curious/serivce/CuriousService.class b/module-domain/build/classes/java/main/com/mile/curious/serivce/CuriousService.class deleted file mode 100644 index 22def72a..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/curious/serivce/CuriousService.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/moim/domain/Moim.class b/module-domain/build/classes/java/main/com/mile/moim/domain/Moim.class deleted file mode 100644 index 6f152f2a..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/moim/domain/Moim.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/moim/serivce/MoimService.class b/module-domain/build/classes/java/main/com/mile/moim/serivce/MoimService.class deleted file mode 100644 index a9ca652d..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/moim/serivce/MoimService.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/penNameProfile/domain/PenName.class b/module-domain/build/classes/java/main/com/mile/penNameProfile/domain/PenName.class deleted file mode 100644 index 71921e9b..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/penNameProfile/domain/PenName.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/penNameProfile/serivce/PenNameProfileService.class b/module-domain/build/classes/java/main/com/mile/penNameProfile/serivce/PenNameProfileService.class deleted file mode 100644 index b5c6c5c5..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/penNameProfile/serivce/PenNameProfileService.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/post/Post.class b/module-domain/build/classes/java/main/com/mile/post/Post.class deleted file mode 100644 index 3def668b..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/post/Post.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/topic/domain/Topic.class b/module-domain/build/classes/java/main/com/mile/topic/domain/Topic.class deleted file mode 100644 index 0ac92394..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/topic/domain/Topic.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/topic/serivce/TopicService.class b/module-domain/build/classes/java/main/com/mile/topic/serivce/TopicService.class deleted file mode 100644 index c7c4ba14..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/topic/serivce/TopicService.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/user/domain/User.class b/module-domain/build/classes/java/main/com/mile/user/domain/User.class deleted file mode 100644 index 6370ba51..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/user/domain/User.class and /dev/null differ diff --git a/module-domain/build/classes/java/main/com/mile/user/serivce/UserService.class b/module-domain/build/classes/java/main/com/mile/user/serivce/UserService.class deleted file mode 100644 index dc8a426c..00000000 Binary files a/module-domain/build/classes/java/main/com/mile/user/serivce/UserService.class and /dev/null differ diff --git a/module-domain/build/resolvedMainClassName b/module-domain/build/resolvedMainClassName deleted file mode 100644 index e69de29b..00000000 diff --git a/module-domain/build/tmp/compileJava/compileTransaction/stash-dir/Post.class.uniqueId1 b/module-domain/build/tmp/compileJava/compileTransaction/stash-dir/Post.class.uniqueId1 deleted file mode 100644 index a9d7dcfd..00000000 Binary files a/module-domain/build/tmp/compileJava/compileTransaction/stash-dir/Post.class.uniqueId1 and /dev/null differ diff --git a/module-domain/build/tmp/compileJava/compileTransaction/stash-dir/PostService.class.uniqueId0 b/module-domain/build/tmp/compileJava/compileTransaction/stash-dir/PostService.class.uniqueId0 deleted file mode 100644 index 6b022246..00000000 Binary files a/module-domain/build/tmp/compileJava/compileTransaction/stash-dir/PostService.class.uniqueId0 and /dev/null differ diff --git a/module-domain/build/tmp/compileJava/previous-compilation-data.bin b/module-domain/build/tmp/compileJava/previous-compilation-data.bin deleted file mode 100644 index 2f668a8e..00000000 Binary files a/module-domain/build/tmp/compileJava/previous-compilation-data.bin and /dev/null differ diff --git a/module-domain/build/tmp/jar/MANIFEST.MF b/module-domain/build/tmp/jar/MANIFEST.MF deleted file mode 100644 index 58630c02..00000000 --- a/module-domain/build/tmp/jar/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0 - diff --git a/module-domain/src/main/java/com/mile/moim/domain/Moim.java b/module-domain/src/main/java/com/mile/moim/domain/Moim.java index 8e81aad3..ddefb685 100644 --- a/module-domain/src/main/java/com/mile/moim/domain/Moim.java +++ b/module-domain/src/main/java/com/mile/moim/domain/Moim.java @@ -15,7 +15,7 @@ public class Moim { @ManyToOne private User owner; private String name; - private String image; + private String imageUrl; private String information; private boolean isPublic; } diff --git a/module-domain/src/main/java/com/mile/penNameProfile/domain/PenName.java b/module-domain/src/main/java/com/mile/penNameProfile/domain/PenName.java index bbfc0733..c6de102c 100644 --- a/module-domain/src/main/java/com/mile/penNameProfile/domain/PenName.java +++ b/module-domain/src/main/java/com/mile/penNameProfile/domain/PenName.java @@ -18,7 +18,7 @@ public class PenName { private Moim moim; private String penName; - private String image; + private String imageUrl; @ManyToOne private User writer; diff --git a/module-domain/src/main/java/com/mile/post/Post.java b/module-domain/src/main/java/com/mile/post/Post.java index 2e43b449..d5cd3ffd 100644 --- a/module-domain/src/main/java/com/mile/post/Post.java +++ b/module-domain/src/main/java/com/mile/post/Post.java @@ -16,7 +16,7 @@ public class Post { private Topic topic; private String title; private String content; - private String image; + private String imageUrl; private int curiousCount; private boolean anonymous; private boolean isTemporary; diff --git a/module-domain/src/main/java/com/mile/user/domain/User.java b/module-domain/src/main/java/com/mile/user/domain/User.java index 1013de3f..cee9a4ea 100644 --- a/module-domain/src/main/java/com/mile/user/domain/User.java +++ b/module-domain/src/main/java/com/mile/user/domain/User.java @@ -13,6 +13,6 @@ public class User { private Long kakaoId; private String email; private String name; - private String image; + private String imageUrl; private String information; }