From afc79c3c7744921879a866141143f7fe8f94a57b Mon Sep 17 00:00:00 2001 From: wonjunYou Date: Fri, 15 Nov 2024 20:13:21 +0900 Subject: [PATCH 1/8] =?UTF-8?q?[DDING-000]=20=ED=85=8C=EC=9D=B4=EB=B8=94?= =?UTF-8?q?=20=EB=B3=B5=EA=B5=AC=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EB=B3=BC?= =?UTF-8?q?=EB=A5=A8=20=EC=97=B0=EA=B2=B0=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compose-dev.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compose-dev.yaml b/compose-dev.yaml index 83b52de2..1e48fd8f 100644 --- a/compose-dev.yaml +++ b/compose-dev.yaml @@ -23,7 +23,8 @@ services: ports: - "3306:3306" volumes: - - mysql-volume:/var/lib/mysql + - /var/lib/docker/volumes/5c9fc061c8d4a72682f54b0bed465f9e91efa0039bd031937479516888b5f872/_data:/var/lib/mysql + volumes: mysql-volume: From ce044c91cfaeb0d00b0dbafab3fcf7d4502c3f8e Mon Sep 17 00:00:00 2001 From: wonjunYou Date: Fri, 15 Nov 2024 20:28:12 +0900 Subject: [PATCH 2/8] =?UTF-8?q?[DDING-000]=20mysql=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?8.0.40=EC=9C=BC=EB=A1=9C=20=EB=A7=88=EC=9D=B4=EA=B7=B8=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compose-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-dev.yaml b/compose-dev.yaml index 1e48fd8f..15ebf1a8 100644 --- a/compose-dev.yaml +++ b/compose-dev.yaml @@ -15,7 +15,7 @@ services: ports: - "8080:8080" mysql: - image: mysql:8.0.33 + image: mysql:8.0.40 environment: MYSQL_DATABASE: ddingdong MYSQL_ROOT_PASSWORD: ${DEV_DB_PASSWORD} From a2d7a961eaa396a1958ac84880c1b88c27e1512b Mon Sep 17 00:00:00 2001 From: wonjunYou Date: Fri, 15 Nov 2024 20:46:43 +0900 Subject: [PATCH 3/8] =?UTF-8?q?[DDING-000]=20compose-dev.yml=20=EB=A1=A4?= =?UTF-8?q?=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compose-dev.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/compose-dev.yaml b/compose-dev.yaml index 15ebf1a8..28374afc 100644 --- a/compose-dev.yaml +++ b/compose-dev.yaml @@ -22,9 +22,6 @@ services: TZ: Asia/Seoul ports: - "3306:3306" - volumes: - - /var/lib/docker/volumes/5c9fc061c8d4a72682f54b0bed465f9e91efa0039bd031937479516888b5f872/_data:/var/lib/mysql - volumes: mysql-volume: From ba1e7c0f418b0d0e6de8811d8704cfa139beec7e Mon Sep 17 00:00:00 2001 From: wonjunYou Date: Fri, 15 Nov 2024 20:49:15 +0900 Subject: [PATCH 4/8] =?UTF-8?q?[DDING-000]=20CI=20trigging=20branch=20?= =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-server-integrator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-server-integrator.yml b/.github/workflows/dev-server-integrator.yml index 1ff5b4ab..55ff9cb5 100644 --- a/.github/workflows/dev-server-integrator.yml +++ b/.github/workflows/dev-server-integrator.yml @@ -3,7 +3,7 @@ name: Develop Server Integrator (CI) on: push: branches: - - develop + - fix/DDING-000 jobs: build_and_push: From 3cedf162b38e1be8a55266dddfa79466f442e518 Mon Sep 17 00:00:00 2001 From: wonjunYou Date: Fri, 15 Nov 2024 20:56:25 +0900 Subject: [PATCH 5/8] =?UTF-8?q?[DDING-000]=20CI=20trigging=20branch=20?= =?UTF-8?q?=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-server-integrator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-server-integrator.yml b/.github/workflows/dev-server-integrator.yml index 55ff9cb5..1ff5b4ab 100644 --- a/.github/workflows/dev-server-integrator.yml +++ b/.github/workflows/dev-server-integrator.yml @@ -3,7 +3,7 @@ name: Develop Server Integrator (CI) on: push: branches: - - fix/DDING-000 + - develop jobs: build_and_push: From 382d89664f41f687bef3947f8283283d14424360 Mon Sep 17 00:00:00 2001 From: wonjunYou Date: Sat, 16 Nov 2024 18:46:21 +0900 Subject: [PATCH 6/8] =?UTF-8?q?[DDING-000]=20=EB=8F=84=EC=BB=A4=20mysql=20?= =?UTF-8?q?=EB=B3=BC=EB=A5=A8=20=EB=AA=85=EC=8B=9C=EC=A0=81=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compose-dev.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compose-dev.yaml b/compose-dev.yaml index 28374afc..a0b3350a 100644 --- a/compose-dev.yaml +++ b/compose-dev.yaml @@ -2,8 +2,6 @@ version: '3.8' services: spring: image: public.ecr.aws/${DEV_ECR_REGISTRY_ALIAS}/dev-ecr:${VERSION:-latest} - volumes: - - mysql-volume:/var/lib/mysql environment: - VERSION=${VERSION:-latest} - SPRING_PROFILES_ACTIVE=dev @@ -14,6 +12,7 @@ services: - mysql ports: - "8080:8080" + mysql: image: mysql:8.0.40 environment: @@ -22,6 +21,8 @@ services: TZ: Asia/Seoul ports: - "3306:3306" + volumes: + - mysql-volume:/var/lib/mysql volumes: mysql-volume: From 767887fd452ec1cc5b168444b5f1655ccecd0e12 Mon Sep 17 00:00:00 2001 From: wonjunYou Date: Sat, 16 Nov 2024 23:53:19 +0900 Subject: [PATCH 7/8] =?UTF-8?q?[DDING-000]=20=EB=8F=84=EC=BB=A4=20?= =?UTF-8?q?=EB=B3=BC=EB=A5=A8=20=EC=9E=84=EC=8B=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- compose-dev.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compose-dev.yaml b/compose-dev.yaml index a0b3350a..d9c2a389 100644 --- a/compose-dev.yaml +++ b/compose-dev.yaml @@ -21,8 +21,10 @@ services: TZ: Asia/Seoul ports: - "3306:3306" + # volumes: + # - mysql-volume:/var/lib/mysql volumes: - - mysql-volume:/var/lib/mysql + - /var/lib/docker/volumes/5c9fc061c8d4a72682f54b0bed465f9e91efa0039bd031937479516888b5f872/_data:/var/lib/mysql volumes: mysql-volume: From cd471970dbcfa87800d4eb712a0356bb23c1c91c Mon Sep 17 00:00:00 2001 From: wonjunYou Date: Sat, 16 Nov 2024 23:53:55 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[DDING-000]=20CI=20triggering=20branch=20?= =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-server-integrator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-server-integrator.yml b/.github/workflows/dev-server-integrator.yml index 1ff5b4ab..55ff9cb5 100644 --- a/.github/workflows/dev-server-integrator.yml +++ b/.github/workflows/dev-server-integrator.yml @@ -3,7 +3,7 @@ name: Develop Server Integrator (CI) on: push: branches: - - develop + - fix/DDING-000 jobs: build_and_push: