diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 5cc48ead..2cffe4a8 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -6,7 +6,7 @@ on: - main jobs: - build: + deploy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -48,6 +48,7 @@ jobs: docker build --build-arg SPRING_PROFILE=prod -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG echo "IMAGE=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_ENV + ## ECS task 정의 - name: Push the image ID in the ECS task definition id: task-def @@ -56,6 +57,7 @@ jobs: task-definition: task-definition-release.json container-name: be-container image: ${{ env.IMAGE }} + ## ECS 실행 - name: Deploy ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml index d8f75339..bea1c9e1 100644 --- a/.github/workflows/deploy-test.yml +++ b/.github/workflows/deploy-test.yml @@ -6,7 +6,7 @@ on: - main jobs: - build: + deploy-test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -48,6 +48,7 @@ jobs: docker build --build-arg SPRING_PROFILE=dev -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG . docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG echo "IMAGE=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_ENV + ## ECS task 정의 - name: Push the image ID in the ECS task definition id: task-def @@ -56,6 +57,7 @@ jobs: task-definition: task-definition-test.json container-name: be-container image: ${{ env.IMAGE }} + ## ECS 실행 - name: Deploy ECS task definition uses: aws-actions/amazon-ecs-deploy-task-definition@v1 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 0801ac14..c0d62c82 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -12,9 +12,9 @@ spring: profiles: active: dev datasource: - url: '{cipher}AQICAHiJ3G9QsgoCm+bUcAPegP56f6tkFnNiijhZN1RaChF0LwH1FqZ1SdLLml95t5OzNgT7AAAAuTCBtgYJKoZIhvcNAQcGoIGoMIGlAgEAMIGfBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDHwCIvhnxcuo02acXAIBEIByDgapp5TYiqev3iAq9mzabK1qZ511Y99obDDHOG1Z8CSvdTuZ2AvSBDIMLLIHq/4Zb5G0mYKhaf2Mf+c6T6L+Eft24pZCja629MsnNgYcGscdSXGwDB9DVDPRb4pplK1xruZVNQB73C76Q+9cSt3gydvy' - username: '{cipher}AQICAHiJ3G9QsgoCm+bUcAPegP56f6tkFnNiijhZN1RaChF0LwH5uVWg4U1DxUi9QUWBoRKTAAAAZjBkBgkqhkiG9w0BBwagVzBVAgEAMFAGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM+XRP/1NdxxJ3dPRDAgEQgCMRZrqJnMlF2dknzWSikAa4JNa5YmFEBGIqe14uutEXkkV+bA==' - password: '{cipher}AQICAHiJ3G9QsgoCm+bUcAPegP56f6tkFnNiijhZN1RaChF0LwG0SkyMOzk2KsOYKFgcgmG9AAAAcDBuBgkqhkiG9w0BBwagYTBfAgEAMFoGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMs/d0AVYz9XOaJnMaAgEQgC1tH81ho3hJEML+MHqSNbZ9GVR/OieGrCoEJjn8oEfrwp5b/sZWuc4mLYfX/MY=' + url: '{cipher}AQICAHiGKnLyWc0ZUra/HszDAQiLV/XwHEAQgwJdRl7/UiE1gAHWpHBhzB+J7tcOrudb96vHAAAAvTCBugYJKoZIhvcNAQcGoIGsMIGpAgEAMIGjBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDLwcTYdyDLFUG1kGsAIBEIB26Lrzr2RbYYNSo5DStoEkTdSolHsNr8WtAB7nQOkmVDZrGStu0Sb3KH9HjfBhgvwLVgtUh1Suk+9fFRIfZgKC7VEyRQB+vrdKmILJRf20WYtUg0VKs8TJ5L3AVOYnuPtSf87hhUtzexYAfLhrRUHY8xVlu4bV6A==' + username: '{cipher}AQICAHiGKnLyWc0ZUra/HszDAQiLV/XwHEAQgwJdRl7/UiE1gAGWpwtXmWvsQVAseYqGO72hAAAAZjBkBgkqhkiG9w0BBwagVzBVAgEAMFAGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQMipQ4aEXUYC7IIJpcAgEQgCPuBK6EIKV7Jd4Qb95oTx3qkEWWdHU6KsVuCAEAYp5wjee88A==' + password: '{cipher}AQICAHiGKnLyWc0ZUra/HszDAQiLV/XwHEAQgwJdRl7/UiE1gAFFXqObvvMFcqtUTmOTr955AAAAcDBuBgkqhkiG9w0BBwagYTBfAgEAMFoGCSqGSIb3DQEHATAeBglghkgBZQMEAS4wEQQM4QZGvOKuZLbQe6zsAgEQgC2AckJVEX/a1XTgS0fo2Sps8sQM3HHzkuzrvVmeXd56wF+1MPZt6H10pvklDR8=' # hikari: # connection-timeout: 250 # max-lifetime: 500 diff --git a/src/main/resources/logback-prod.xml b/src/main/resources/logback-prod.xml index ee0d0c58..d1b40de2 100644 --- a/src/main/resources/logback-prod.xml +++ b/src/main/resources/logback-prod.xml @@ -7,17 +7,17 @@ - - 15.164.211.181:5000 - - - INFO - - + + + + + + + - + \ No newline at end of file diff --git a/task-definition-test.json b/task-definition-test.json index a555ce4c..433ea8a9 100644 --- a/task-definition-test.json +++ b/task-definition-test.json @@ -1,6 +1,6 @@ { "ipcMode": null, - "executionRoleArn": "arn:aws:iam::224066583965:role/AWSECSTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::804073597504:role/AWSECSTaskExecutionRole", "containerDefinitions": [ { "dnsSearchDomains": null, @@ -37,7 +37,7 @@ "memoryReservation": 500, "volumesFrom": [], "stopTimeout": null, - "image": "224066583965.dkr.ecr.ap-northeast-2.amazonaws.com/be-repo:test", + "image": "804073597504.dkr.ecr.ap-northeast-2.amazonaws.com/be-repo:test", "startTimeout": null, "firelensConfiguration": null, "dependsOn": null, @@ -59,7 +59,7 @@ ], "placementConstraints": [], "memory": null, - "taskRoleArn": "arn:aws:iam::224066583965:role/AWSECSTaskExecutionRole", + "taskRoleArn": "arn:aws:iam::804073597504:role/AWSECSTaskExecutionRole", "family": "be-test", "pidMode": null, "requiresCompatibilities": [