From 4d18b26dbc32b16da042db79bf207a166ed8d6e0 Mon Sep 17 00:00:00 2001 From: Bellroute Date: Fri, 23 Jun 2023 00:35:51 +0900 Subject: [PATCH 1/5] =?UTF-8?q?setting:=20db=20=EC=97=B0=EA=B2=B0=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD(rds=20->=20docker=20container)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod_db.yml | 10 ++++++---- .../src/main/resources/application-prod_redis.yml | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/collusic-be/src/main/resources/application-prod_db.yml b/server/collusic-be/src/main/resources/application-prod_db.yml index 6a473cd1..74245f36 100644 --- a/server/collusic-be/src/main/resources/application-prod_db.yml +++ b/server/collusic-be/src/main/resources/application-prod_db.yml @@ -1,9 +1,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ENC(0UN3QoywTt1aetAUuH2wBmNQ81GfewuEflb08Q7KfEv+AZ82o3C65RruLLWFtOemgsLQ/+xmqmv/O45y/NrUTDv/hOYG+9lC6/4w/TQ6H778gFuUKVxYyh9/k6egITMTRkfcW/VDeJJfWh+KVMBSyAlmrFZRo7nFnsZCjuXRG9W1d2SkNqJJ9Ik044jnVPv2) - username: ENC(mf26xrSdlsDGLOp2uRVtYQ==) - password: ENC(B9/bakG1kuaw3NeCNI4dq6K/zkFiyO7uSWx6IR7jUQA=) + url: ENC(sA1qQk9QtqoPqEJkgh0yUSh8NIhMgmnYJgW0GYQRmnGLMPBh2vVR1pAyD3SUQOMoKMM2ZsyLnz7Btl1u0kMbbXIEpuh4OmyfQ0QmAHeaYBa/RSjc3pY3+x29SVHOwAUo0xyDCq3VUu/urs6Qt0VUduPNFS0RnHJg) + username: ENC(Ue2fqsFH4tufRUGznOeZgA==) + password: ENC(sb6mOsr7dFp5iQiIZ0rd3x1iV6qlQJuX) jpa: show-sql: true @@ -15,4 +15,6 @@ spring: batch_size: 10 hibernate: ddl-auto: validate - generate-ddl: false \ No newline at end of file + generate-ddl: false + database: mysql + database-platform: org.hibernate.dialect.MySQL5InnoDBDialect \ No newline at end of file diff --git a/server/collusic-be/src/main/resources/application-prod_redis.yml b/server/collusic-be/src/main/resources/application-prod_redis.yml index 351b1642..613d2c81 100644 --- a/server/collusic-be/src/main/resources/application-prod_redis.yml +++ b/server/collusic-be/src/main/resources/application-prod_redis.yml @@ -1,4 +1,4 @@ spring: redis: - host: localhost + host: redis port: 6379 \ No newline at end of file From 4a372ad62de633088d79d0c06f5d54263ac4ecbd Mon Sep 17 00:00:00 2001 From: JongKeun Kim Date: Fri, 23 Jun 2023 23:46:45 +0900 Subject: [PATCH 2/5] Update gradle.yml --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 27c69ac0..76dc6876 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -59,8 +59,8 @@ jobs: key: ${{ secrets.SSH_KEY }} port: 22 script: | - sudo docker rm -f $(docker ps -aq) - sudo docker rmi `docker images -a -q` + sudo docker ps --format '{{.Names}}' | grep -v 'mysql' | xargs -I {} docker rm {} + sudo docker image ls | grep -v 'mysql' | awk '{print $3}' | xargs -I {} docker image rm {} cd app rm -rf docker-compose.yml touch ./docker-compose.yml From 3d2d74b379a1d8c56fd6d67ae6d4e63cef3f8a6b Mon Sep 17 00:00:00 2001 From: Bellroute Date: Tue, 27 Jun 2023 15:56:00 +0900 Subject: [PATCH 3/5] fix: rollback setting --- .../src/main/resources/application-prod_db.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/server/collusic-be/src/main/resources/application-prod_db.yml b/server/collusic-be/src/main/resources/application-prod_db.yml index 74245f36..6a473cd1 100644 --- a/server/collusic-be/src/main/resources/application-prod_db.yml +++ b/server/collusic-be/src/main/resources/application-prod_db.yml @@ -1,9 +1,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ENC(sA1qQk9QtqoPqEJkgh0yUSh8NIhMgmnYJgW0GYQRmnGLMPBh2vVR1pAyD3SUQOMoKMM2ZsyLnz7Btl1u0kMbbXIEpuh4OmyfQ0QmAHeaYBa/RSjc3pY3+x29SVHOwAUo0xyDCq3VUu/urs6Qt0VUduPNFS0RnHJg) - username: ENC(Ue2fqsFH4tufRUGznOeZgA==) - password: ENC(sb6mOsr7dFp5iQiIZ0rd3x1iV6qlQJuX) + url: ENC(0UN3QoywTt1aetAUuH2wBmNQ81GfewuEflb08Q7KfEv+AZ82o3C65RruLLWFtOemgsLQ/+xmqmv/O45y/NrUTDv/hOYG+9lC6/4w/TQ6H778gFuUKVxYyh9/k6egITMTRkfcW/VDeJJfWh+KVMBSyAlmrFZRo7nFnsZCjuXRG9W1d2SkNqJJ9Ik044jnVPv2) + username: ENC(mf26xrSdlsDGLOp2uRVtYQ==) + password: ENC(B9/bakG1kuaw3NeCNI4dq6K/zkFiyO7uSWx6IR7jUQA=) jpa: show-sql: true @@ -15,6 +15,4 @@ spring: batch_size: 10 hibernate: ddl-auto: validate - generate-ddl: false - database: mysql - database-platform: org.hibernate.dialect.MySQL5InnoDBDialect \ No newline at end of file + generate-ddl: false \ No newline at end of file From f741cc4ce15a6513e095f152b0944a0c9af02660 Mon Sep 17 00:00:00 2001 From: Bellroute Date: Tue, 27 Jun 2023 16:56:21 +0900 Subject: [PATCH 4/5] setting: fix datasource url --- server/collusic-be/src/main/resources/application-prod_db.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/collusic-be/src/main/resources/application-prod_db.yml b/server/collusic-be/src/main/resources/application-prod_db.yml index 6a473cd1..719fbc52 100644 --- a/server/collusic-be/src/main/resources/application-prod_db.yml +++ b/server/collusic-be/src/main/resources/application-prod_db.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ENC(0UN3QoywTt1aetAUuH2wBmNQ81GfewuEflb08Q7KfEv+AZ82o3C65RruLLWFtOemgsLQ/+xmqmv/O45y/NrUTDv/hOYG+9lC6/4w/TQ6H778gFuUKVxYyh9/k6egITMTRkfcW/VDeJJfWh+KVMBSyAlmrFZRo7nFnsZCjuXRG9W1d2SkNqJJ9Ik044jnVPv2) + url: ENC(3HaL7KseKUVsXdh+swXuoCvXhQtpFEnd+94YT5XuMuJidnJU9s+GKcl/XU8nlguO3wnG9uFp3c454dHcGQAywksfler+9OTrjkSy+l3v+GWyLEjC2QlvYkP/o7ug0s/4H7z+U7vMZr5tMulzkiFhoNk7NVvgcyTh3x9HvgmJiabMFtx8WXISrAJUtKlgnPTMVZCZwAuTrGr95GfMOcCjTA==) username: ENC(mf26xrSdlsDGLOp2uRVtYQ==) password: ENC(B9/bakG1kuaw3NeCNI4dq6K/zkFiyO7uSWx6IR7jUQA=) From 7bd49c6086945a3e5f5e3ae159a03a1c14f1e35b Mon Sep 17 00:00:00 2001 From: JongKeun Kim Date: Tue, 27 Jun 2023 17:00:31 +0900 Subject: [PATCH 5/5] Update gradle.yml --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 76dc6876..27c69ac0 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -59,8 +59,8 @@ jobs: key: ${{ secrets.SSH_KEY }} port: 22 script: | - sudo docker ps --format '{{.Names}}' | grep -v 'mysql' | xargs -I {} docker rm {} - sudo docker image ls | grep -v 'mysql' | awk '{print $3}' | xargs -I {} docker image rm {} + sudo docker rm -f $(docker ps -aq) + sudo docker rmi `docker images -a -q` cd app rm -rf docker-compose.yml touch ./docker-compose.yml