diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 26e7a472..14db763e 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -13,12 +13,12 @@ env: DATASOURCE_PASSWORD : ${{ sccrets.ENV_DATASOURCE_PASSWORD }} GOOGLE_CLIENT_ID : ${{ secrets.ENV_GOOGLE_CLIENT_ID }} GOOGLE_CLIENT_SECRET: ${{ secrets.ENV_GOOGLE_CLIENT_SECRET }} - GOOGLE_REDIRECT_URI : ${{ secrets.ENV_GOOGLE_REDIRECT_URI }} + IMAGE_UPLOAD_PATH : ${{ secrets.ENV_IMAGE_UPLOAD_PATH }} JWT_SECRET : ${{ secrets.ENV_JWT_SECRET }} KAKAO_CLIENT_ID : ${{ secrets.ENV_KAKAO_CLIENT_ID }} KAKAO_CLIENT_SECRET : ${{ secrets.ENV_KAKAO_CLIENT_SECRET }} - KAKAO_REDIRECT_URI : ${{ secrets.ENV_KAKAO_REDIRECT_URI }} KAKAOPAY_SECRET_KEY : ${{ secrets.ENV_KAKAOPAY_SECRET_KEY }} + SERVER_DOMAIN_NAME : ${{ secrets.ENV_SERVER_DOMAIN_NAME }} jobs: ## 1단계: 프로젝트 빌드 @@ -143,12 +143,12 @@ jobs: echo "DATASOURCE_PASSWORD=${{ sccrets.ENV_DATASOURCE_PASSWORD }}" >> ~/.env echo "GOOGLE_CLIENT_ID=${{ secrets.ENV_GOOGLE_CLIENT_ID }}" >> ~/.env echo "GOOGLE_CLIENT_SECRET=${{ secrets.ENV_GOOGLE_CLIENT_SECRET }}" >> ~/.env - echo "GOOGLE_REDIRECT_URI=${{ secrets.ENV_GOOGLE_REDIRECT_URI }}" >> ~/.env echo "JWT_SECRET=${{ secrets.ENV_JWT_SECRET }}" >> ~/.env + echo "IMAGE_UPLOAD_PATH=${{ secrets.ENV_IMAGE_UPLOAD_PATH }}" >> ~/.env echo "KAKAO_CLIENT_ID=${{ secrets.ENV_KAKAO_CLIENT_ID }}" >> ~/.env echo "KAKAO_CLIENT_SECRET=${{ secrets.ENV_KAKAO_CLIENT_SECRET }}" >> ~/.env - echo "KAKAO_REDIRECT_URI=${{ secrets.ENV_KAKAO_REDIRECT_URI }}" >> ~/.env echo "KAKAOPAY_SECRET_KEY=${{ secrets.ENV_KAKAOPAY_SECRET_KEY }}" >> ~/.env + echo "SERVER_DOMAIN_NAME=${{ secrets.ENV_SERVER_DOMAIN_NAME }}" >> ~/.env echo "Environment setup has been completed." - name: Pull New Docker Image @@ -179,7 +179,7 @@ jobs: key: ${{ secrets.SSH_PRIVATE_KEY }} port: ${{ secrets.SSH_PORT }} envs: GITHUB_SHA - script: sudo docker run --rm -d -p 80:8080 --env-file ~/.env --name would-you-in ${{ secrets.DOCKER_REPO_FULLNAME }} + script: sudo docker run --rm -d -p 80:8080 --env-file ~/.env --name would-you-in -v would-you-in-image-volume:${{ secrets.ENV_IMAGE_UPLOAD_PATH }} ${{ secrets.DOCKER_REPO_FULLNAME }} - name: Clean-Up Docker Image uses: appleboy/ssh-action@master diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1574c14b..67bc43e7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -43,9 +43,9 @@ logging.level.org.ktc2.cokaen.wouldyouin: debug # for image storage path image: - api-url: http://52.78.71.136/api/images + api-url: ${SERVER_DOMAIN_NAME}/api/images upload: - parent-path: src/main/resources/static/images + parent-path: ${IMAGE_UPLOAD_PATH} curation: child-path: curation member: @@ -74,7 +74,7 @@ oauth: client: id: ${KAKAO_CLIENT_ID} secret: ${KAKAO_CLIENT_SECRET} - redirect_uri: ${KAKAO_REDIRECT_URI} + redirect_uri: ${SERVER_DOMAIN_NAME}/api/auth/social/redirect/kakao google: uri: login: @@ -86,14 +86,14 @@ oauth: client: id: ${GOOGLE_CLIENT_ID} secret: ${GOOGLE_CLIENT_SECRET} - redirect_uri: ${GOOGLE_REDIRECT_URI} + redirect_uri: ${SERVER_DOMAIN_NAME}/api/auth/social/redirect/google scope: - email - profile payment: - "approval_url": "http://localhost:8080/api/events" - "cancel_url": "http://localhost:8080/api/events" - "fail_url": "http://localhost:8080/api/events" + "approval_url": ${SERVER_DOMAIN_NAME}/api/events + "cancel_url": ${SERVER_DOMAIN_NAME}/api/events + "fail_url": ${SERVER_DOMAIN_NAME}/api/events "secret_key": ${KAKAOPAY_SECRET_KEY} - "kakao_pay_single_payment_url": "online/v1/payment/ready" - "kakao-pay-request-host": "https://open-api.kakaopay.com" \ No newline at end of file + "kakao_pay_single_payment_url": online/v1/payment/ready + "kakao-pay-request-host": https://open-api.kakaopay.com \ No newline at end of file