Deploy #35

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.

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

Merged

jimin-fundamental merged 9 commits into main from deploy

Jan 25, 2025

0 learningFlow/.gitattributes → .gitattributes

File renamed without changes.

.github/workflows/main.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -29,8 +29,8 @@ jobs:
  
        - name: Build and push

          uses: docker/build-push-action@v4

          with:

            context: .

            file: ./Dockerfile

            context: . # Dockerfile이 있는 디렉토리

            file: ./Dockerfile  # Dockerfile 경로 지정

            push: true

            tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPONAME }}

    @@ -39,18 +39,24 @@ jobs:
  
        needs: [docker]

        steps:

        # SSH Connect and Docker Image Pull and Container Run

        - name: SSH Connect and Docker Image Pull and Container Run

          uses: appleboy/[email protected]

        - name: Deploy to Server

          uses: appleboy/ssh-action@master

          with:

            host: ${{ secrets.EC2_HOST }}

            username: ${{ secrets.EC2_USER }}

            key: ${{ secrets.EC2_SSH_KEY }}

            port: 22

            envs: GITHUB_SHA

            script: |

              docker stop my-was || true

              docker rm my-was || true

              docker image rm ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPONAME }} || true

              docker run -d -p 8080:8080 \

              -v /root/my-proj/resources:/app/resources \

              --name my-was ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPONAME }}

              sudo docker ps -qa | xargs -r sudo docker rm -f

              sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPONAME }}:latest

              sudo docker run -d -p 8080:8080 \

              -e MAIL_PASSWORD=${{ secrets.MAIL_PASSWORD }} \

              -e MAIL_USERNAME=${{ secrets.MAIL_USERNAME }} \

              -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_ID=${{ secrets.SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_ID }} \

              -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_SECRET=${{ secrets.SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_SECRET }} \

              -e JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }} \

              -e DB_URL=${{ secrets.DB_URL }} \

              -e DB_USER=${{ secrets.DB_USER }} \

              -e DB_PASSWORD=${{ secrets.DB_PASSWORD }} \

              ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPONAME }}:latest

              sudo docker image prune -f

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ bin/ @@
     ### IntelliJ IDEA ###
     .idea
-    #../.idea
+    ../.idea
     *.iws
     *.iml
@@ Expand All / @@ -43,3 +43,6 @@ out/ @@
     ### gradle ###
     .gradle/
+    ### 환경변수 ###
+    .env

0 learningFlow/Dockerfile → Dockerfile

File renamed without changes.

0 learningFlow/build.gradle → build.gradle

File renamed without changes.

0 learningFlow/docker-compose.yml → docker-compose.yml

File renamed without changes.

0 learningFlow/erd.md → erd.md

File renamed without changes.

0 ...ingFlow/gradle/wrapper/gradle-wrapper.jar → gradle/wrapper/gradle-wrapper.jar

File renamed without changes.

0 .../gradle/wrapper/gradle-wrapper.properties → gradle/wrapper/gradle-wrapper.properties

File renamed without changes.

0 learningFlow/gradlew → gradlew

File renamed without changes.

0 learningFlow/gradlew.bat → gradlew.bat

File renamed without changes.

learningFlow/.idea/compiler.xml

This file was deleted.

0 learningFlow/settings.gradle → settings.gradle

File renamed without changes.

0 ...w/learningFlow_BE/domain/QBaseEntity.java → ...w/learningFlow_BE/domain/QBaseEntity.java

File renamed without changes.

0 ...w/learningFlow_BE/domain/QCollection.java → ...w/learningFlow_BE/domain/QCollection.java

File renamed without changes.

0 ...ingFlow_BE/domain/QCollectionEpisode.java → ...ingFlow_BE/domain/QCollectionEpisode.java

File renamed without changes.

0 ...ow_BE/domain/QEmailVerificationToken.java → ...ow_BE/domain/QEmailVerificationToken.java

File renamed without changes.

0 ...ngFlow/learningFlow_BE/domain/QImage.java → ...ngFlow/learningFlow_BE/domain/QImage.java

File renamed without changes.

0 ...ingFlow/learningFlow_BE/domain/QMemo.java → ...ingFlow/learningFlow_BE/domain/QMemo.java

File renamed without changes.

0 ...gFlow/learningFlow_BE/domain/QMemoId.java → ...gFlow/learningFlow_BE/domain/QMemoId.java

File renamed without changes.

0 ...ngFlow_BE/domain/QPasswordResetToken.java → ...ngFlow_BE/domain/QPasswordResetToken.java

File renamed without changes.

0 ...low/learningFlow_BE/domain/QResource.java → ...low/learningFlow_BE/domain/QResource.java

File renamed without changes.

0 ...ingFlow/learningFlow_BE/domain/QUser.java → ...ingFlow/learningFlow_BE/domain/QUser.java

File renamed without changes.

0 ...arningFlow_BE/domain/QUserCollection.java → ...arningFlow_BE/domain/QUserCollection.java

File renamed without changes.

0 ...ingFlow_BE/LearningFlowBeApplication.java → ...ingFlow_BE/LearningFlowBeApplication.java

File renamed without changes.

0 ...arningFlow_BE/apiPayload/ApiResponse.java → ...arningFlow_BE/apiPayload/ApiResponse.java

File renamed without changes.

0 ...ningFlow_BE/apiPayload/code/BaseCode.java → ...ningFlow_BE/apiPayload/code/BaseCode.java

File renamed without changes.

0 ...low_BE/apiPayload/code/BaseErrorCode.java → ...low_BE/apiPayload/code/BaseErrorCode.java

File renamed without changes.

0 ...ow_BE/apiPayload/code/ErrorReasonDTO.java → ...ow_BE/apiPayload/code/ErrorReasonDTO.java

File renamed without changes.

0 ...ingFlow_BE/apiPayload/code/ReasonDTO.java → ...ingFlow_BE/apiPayload/code/ReasonDTO.java

File renamed without changes.

0 ...E/apiPayload/code/status/ErrorStatus.java → ...E/apiPayload/code/status/ErrorStatus.java

File renamed without changes.

0 ...apiPayload/code/status/SuccessStatus.java → ...apiPayload/code/status/SuccessStatus.java

File renamed without changes.

0 ...apiPayload/exception/ExceptionAdvice.java → ...apiPayload/exception/ExceptionAdvice.java

File renamed without changes.

0 ...piPayload/exception/GeneralException.java → ...piPayload/exception/GeneralException.java

File renamed without changes.

0 .../exception/handler/CollectionHandler.java → .../exception/handler/CollectionHandler.java

File renamed without changes.

0 ...yload/exception/handler/LoginHandler.java → ...yload/exception/handler/LoginHandler.java

File renamed without changes.

0 ...ayload/exception/handler/PageHandler.java → ...ayload/exception/handler/PageHandler.java

File renamed without changes.

0 ...ad/exception/handler/ResourceHandler.java → ...ad/exception/handler/ResourceHandler.java

File renamed without changes.

0 ...ayload/exception/handler/UserHandler.java → ...ayload/exception/handler/UserHandler.java

File renamed without changes.

0 ...earningFlow_BE/config/QueryDslConfig.java → ...earningFlow_BE/config/QueryDslConfig.java

File renamed without changes.

0 ...learningFlow_BE/config/SwaggerConfig.java → ...learningFlow_BE/config/SwaggerConfig.java

File renamed without changes.

0 ...ningFlow_BE/config/redis/RedisConfig.java → ...ningFlow_BE/config/redis/RedisConfig.java

File renamed without changes.

0 ...ingFlow_BE/config/security/JwtConfig.java → ...ingFlow_BE/config/security/JwtConfig.java

File renamed without changes.

0 ...ow_BE/config/security/SecurityConfig.java → ...ow_BE/config/security/SecurityConfig.java

File renamed without changes.

0 ...low_BE/converter/CollectionConverter.java → ...low_BE/converter/CollectionConverter.java

File renamed without changes.

0 ...rningFlow_BE/converter/MemoConverter.java → ...rningFlow_BE/converter/MemoConverter.java

File renamed without changes.

0 ...rningFlow_BE/converter/UserConverter.java → ...rningFlow_BE/converter/UserConverter.java

File renamed without changes.

0 ...ow/learningFlow_BE/domain/BaseEntity.java → ...ow/learningFlow_BE/domain/BaseEntity.java

File renamed without changes.

0 ...ow/learningFlow_BE/domain/Collection.java → ...ow/learningFlow_BE/domain/Collection.java

File renamed without changes.

0 ...ningFlow_BE/domain/CollectionEpisode.java → ...ningFlow_BE/domain/CollectionEpisode.java

File renamed without changes.

0 ...low_BE/domain/EmailVerificationToken.java → ...low_BE/domain/EmailVerificationToken.java

File renamed without changes.

0 ...ingFlow/learningFlow_BE/domain/Image.java → ...ingFlow/learningFlow_BE/domain/Image.java

File renamed without changes.

0 ...ningFlow/learningFlow_BE/domain/Memo.java → ...ningFlow/learningFlow_BE/domain/Memo.java

File renamed without changes.

0 ...ngFlow/learningFlow_BE/domain/MemoId.java → ...ngFlow/learningFlow_BE/domain/MemoId.java

File renamed without changes.

0 ...ingFlow_BE/domain/PasswordResetToken.java → ...ingFlow_BE/domain/PasswordResetToken.java

File renamed without changes.

0 ...Flow/learningFlow_BE/domain/Resource.java → ...Flow/learningFlow_BE/domain/Resource.java

File renamed without changes.

0 ...ningFlow/learningFlow_BE/domain/User.java → ...ningFlow/learningFlow_BE/domain/User.java

File renamed without changes.

0 ...earningFlow_BE/domain/UserCollection.java → ...earningFlow_BE/domain/UserCollection.java

File renamed without changes.

0 .../learningFlow_BE/domain/enums/Gender.java → .../learningFlow_BE/domain/enums/Gender.java

File renamed without changes.

0 ...ngFlow_BE/domain/enums/InterestField.java → ...ngFlow_BE/domain/enums/InterestField.java

File renamed without changes.

0 ...low/learningFlow_BE/domain/enums/Job.java → ...low/learningFlow_BE/domain/enums/Job.java

File renamed without changes.

0 ...arningFlow_BE/domain/enums/MediaType.java → ...arningFlow_BE/domain/enums/MediaType.java

File renamed without changes.

0 ...ingFlow_BE/domain/enums/ResourceType.java → ...ingFlow_BE/domain/enums/ResourceType.java

File renamed without changes.

0 ...ow/learningFlow_BE/domain/enums/Role.java → ...ow/learningFlow_BE/domain/enums/Role.java

File renamed without changes.

0 ...rningFlow_BE/domain/enums/SocialType.java → ...rningFlow_BE/domain/enums/SocialType.java

File renamed without changes.

0 ...ory/EmailVerificationTokenRepository.java → ...ory/EmailVerificationTokenRepository.java

File renamed without changes.

0 ...ngFlow_BE/repository/ImageRepository.java → ...ngFlow_BE/repository/ImageRepository.java

File renamed without changes.

0 ...ingFlow_BE/repository/MemoRepository.java → ...ingFlow_BE/repository/MemoRepository.java

File renamed without changes.

0 ...ository/PasswordResetTokenRepository.java → ...ository/PasswordResetTokenRepository.java

File renamed without changes.

0 ...ingFlow_BE/repository/UserRepository.java → ...ingFlow_BE/repository/UserRepository.java

File renamed without changes.

0 ...tory/collection/CollectionRepository.java → ...tory/collection/CollectionRepository.java

File renamed without changes.

0 ...ollection/CollectionRepositoryCustom.java → ...ollection/CollectionRepositoryCustom.java

File renamed without changes.

0 .../collection/CollectionRepositoryImpl.java → .../collection/CollectionRepositoryImpl.java

File renamed without changes.

0 ...ow_BE/security/auth/PrincipalDetails.java → ...ow_BE/security/auth/PrincipalDetails.java

File renamed without changes.

0 ...ndler/CustomAuthenticationEntryPoint.java → ...ndler/CustomAuthenticationEntryPoint.java

File renamed without changes.

0 ...BE/security/handler/JwtLogoutHandler.java → ...BE/security/handler/JwtLogoutHandler.java

File renamed without changes.

0 ...ty/handler/OAuth2LoginSuccessHandler.java → ...ty/handler/OAuth2LoginSuccessHandler.java

File renamed without changes.

0 ...security/jwt/JwtAuthenticationFilter.java → ...security/jwt/JwtAuthenticationFilter.java

File renamed without changes.

0 ...ngFlow_BE/security/jwt/JwtProperties.java → ...ngFlow_BE/security/jwt/JwtProperties.java

File renamed without changes.

...low_BE/security/jwt/JwtTokenProvider.java → ...low_BE/security/jwt/JwtTokenProvider.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,8 @@ public class JwtTokenProvider { @@
         private final JwtProperties jwtProperties;
         private final SecretKey jwtSecretKey;
         public String createAccessToken(Authentication authentication) {
             PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal();
             User user = principalDetails.getUser();
@@ Expand Down @@

0 ...uth/common/AuthTokenCleanupScheduler.java → ...uth/common/AuthTokenCleanupScheduler.java

File renamed without changes.

0 .../common/UserVerificationEmailService.java → .../common/UserVerificationEmailService.java

File renamed without changes.

0 ...vice/auth/local/LocalUserAuthService.java → ...vice/auth/local/LocalUserAuthService.java

File renamed without changes.

0 ...auth/OAuth2UserAuthenticationService.java → ...auth/OAuth2UserAuthenticationService.java

File renamed without changes.

0 .../oauth/OAuth2UserRegistrationService.java → .../oauth/OAuth2UserRegistrationService.java

File renamed without changes.

0 ...BE/service/auth/oauth/OAuth2UserTemp.java → ...BE/service/auth/oauth/OAuth2UserTemp.java

File renamed without changes.

0 ...service/collection/CollectionService.java → ...service/collection/CollectionService.java

File renamed without changes.

0 ...w_BE/service/memo/MemoCommandService.java → ...w_BE/service/memo/MemoCommandService.java

File renamed without changes.

0 .../service/memo/MemoCommandServiceImpl.java → .../service/memo/MemoCommandServiceImpl.java

File renamed without changes.

0 ...ervice/user/CustomUserDetailsService.java → ...ervice/user/CustomUserDetailsService.java

File renamed without changes.

0 ...ningFlow_BE/service/user/UserService.java → ...ningFlow_BE/service/user/UserService.java

File renamed without changes.

0 ...w_BE/validation/annotation/CheckPage.java → ...w_BE/validation/annotation/CheckPage.java

File renamed without changes.

0 .../validator/CheckPageArgumentResolver.java → .../validator/CheckPageArgumentResolver.java

File renamed without changes.

0 .../controller/CollectionRestController.java → .../controller/CollectionRestController.java

File renamed without changes.

0 ...BE/web/controller/HomeRestController.java → ...BE/web/controller/HomeRestController.java

File renamed without changes.

0 ...ow_BE/web/controller/LoginController.java → ...ow_BE/web/controller/LoginController.java

File renamed without changes.

0 ...eb/controller/ResourceRestController.java → ...eb/controller/ResourceRestController.java

File renamed without changes.

0 .../web/controller/SearchRestController.java → .../web/controller/SearchRestController.java

File renamed without changes.

0 ...BE/web/controller/UserRestController.java → ...BE/web/controller/UserRestController.java

File renamed without changes.

0 .../learningFlow_BE/web/dto/TempRequest.java → .../learningFlow_BE/web/dto/TempRequest.java

File renamed without changes.

0 ...learningFlow_BE/web/dto/TempResponse.java → ...learningFlow_BE/web/dto/TempResponse.java

File renamed without changes.

0 ...Flow_BE/web/dto/bookmark/BookmarkDTO.java → ...Flow_BE/web/dto/bookmark/BookmarkDTO.java

File renamed without changes.

0 .../dto/collection/CollectionRequestDTO.java → .../dto/collection/CollectionRequestDTO.java

File renamed without changes.

0 ...dto/collection/CollectionResponseDTO.java → ...dto/collection/CollectionResponseDTO.java

File renamed without changes.

0 ...Flow_BE/web/dto/home/HomeResponseDTO.java → ...Flow_BE/web/dto/home/HomeResponseDTO.java

File renamed without changes.

0 ...gFlow_BE/web/dto/memo/MemoRequestDTO.java → ...gFlow_BE/web/dto/memo/MemoRequestDTO.java

File renamed without changes.

0 ...Flow_BE/web/dto/memo/MemoResponseDTO.java → ...Flow_BE/web/dto/memo/MemoResponseDTO.java

File renamed without changes.

0 .../web/dto/resource/ResourceRequestDTO.java → .../web/dto/resource/ResourceRequestDTO.java

File renamed without changes.

0 ...web/dto/resource/ResourceResponseDTO.java → ...web/dto/resource/ResourceResponseDTO.java

File renamed without changes.

0 ...w_BE/web/dto/search/SearchRequestDTO.java → ...w_BE/web/dto/search/SearchRequestDTO.java

File renamed without changes.

0 ...gFlow_BE/web/dto/user/UserRequestDTO.java → ...gFlow_BE/web/dto/user/UserRequestDTO.java

File renamed without changes.

0 ...Flow_BE/web/dto/user/UserResponseDTO.java → ...Flow_BE/web/dto/user/UserResponseDTO.java

File renamed without changes.

0 ...ngFlow/src/main/resources/application.yml → src/main/resources/application.yml

File renamed without changes.

0 ...ow_BE/LearningFlowBeApplicationTests.java → ...ow_BE/LearningFlowBeApplicationTests.java

File renamed without changes.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Deploy #35

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!