From e26eb048cd37628c4c022299e5200004b767248d Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 25 Jul 2024 22:02:45 +0900 Subject: [PATCH 1/2] chore: config setup (#219) * add gitignore * add local jdbc config * tidy code owner --- .github/CODEOWNERS | 2 +- .gitignore | 3 +++ module-domain/src/main/resources/application-local.yml | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index df13e61..baff36e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @IW-MOON @nature1216 @junhaesung +* @chicori3 diff --git a/.gitignore b/.gitignore index 3651bac..b3ad20c 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,6 @@ out/ # tomcat access log /work/ /logs/ + +spring.log +gradlew \ No newline at end of file diff --git a/module-domain/src/main/resources/application-local.yml b/module-domain/src/main/resources/application-local.yml index a7709e6..001538d 100644 --- a/module-domain/src/main/resources/application-local.yml +++ b/module-domain/src/main/resources/application-local.yml @@ -23,7 +23,7 @@ cloud: ygtang: domain: datasource: - jdbcUrl: ENC(Qagc87PeOwmR8Zh73hU/bii+ZjzTPI7shAmw3pPxdLqXHF5MXACQparai0qWTUb6rBMXGPuqohNDhKfKx/wc21ysVuOCel9WEf2R0Le/RJhI8oVlaHZMmp6eq/yR2lsbW1ZB+n7zIi2gKgOTu2U9g4zRcA8EH3KTLK5+ps998vZRyCOIg8gW9/IJab5A8uSIgnUjwjJGdxAYcNd6+PMoceEhDfeW6wVldT7KNQeHhjofmi565uyWGQtHTfOQHbjcaBjH5CtI7/tWGaYVxdpLlC+d6kZ2wm/7H4rB0oGa9DZw7dy1JE4ymFcL67b6p2mEsi6ysBMZ+fTypM90Snb8RA==) - username: ENC(pD8lmKr4PXMRCUto6pMF9Ub/iJCxKveTODoqXQm1fDEB4rVN1Nzs6sftmidgYWOP) - password: ENC(MJISIAE2hpfyzQjAFQwM8o+Wtv5rHP5lJDwBq3mEIUkr93OEMj+uqYmXDjasb7El) + jdbcUrl: jdbc:mysql://localhost:3306/inspiration?autoReconnect=true&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&characterEncoding=utf8&useSSL=false&useUnicode=true + username: root + password: ygt driver-class-name: com.mysql.cj.jdbc.Driver From 1d309b65a58b3963b8734d240ce6a2a9a089cdb3 Mon Sep 17 00:00:00 2001 From: sian Date: Thu, 25 Jul 2024 22:03:18 +0900 Subject: [PATCH 2/2] add docker push step (#220) --- .github/workflows/prod_deploy.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/prod_deploy.yml b/.github/workflows/prod_deploy.yml index 464fa20..fe5c46e 100644 --- a/.github/workflows/prod_deploy.yml +++ b/.github/workflows/prod_deploy.yml @@ -35,6 +35,13 @@ jobs: mkdir deploy/scripts cp ./scripts/* ./deploy/scripts/ + - name: Docker push + run: | + cd module-web + echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin + docker build -t ${{ secrets.DOCKER_REPOSITORY_PROD }} . + docker push ${{ secrets.DOCKER_REPOSITORY_PROD }} + - name: Make zip file run: zip -r ./$GITHUB_SHA.zip ./deploy/ shell: bash