From 1fecc0120a5e3982dfe7dc0c93507845eebde472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=82=98=EA=B2=BD=ED=98=B8?= Date: Mon, 1 Jul 2024 23:07:40 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20test=20=ED=99=98=EA=B2=BD=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 --- .github/workflows/ci-cd.yml | 8 -------- build.gradle | 4 +++- compose-dev.yaml | 10 ---------- src/main/resources/application-dev.yml | 11 ----------- 4 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 compose-dev.yaml diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 01ec023..dc703be 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -41,14 +41,6 @@ jobs: echo "${{ secrets.YML_DEV }}" > ./application-dev.yml shell: bash - # docker compose 파일 생성 - dev - - name: make compose-dev.yaml - if: contains(github.ref, 'develop') - run: | - touch ./compose-dev.yaml - echo "${{ secrets.COMPOSE_YML_DEV }}" > ./compose-dev.yaml - shell: bash - # Gradle 패키지 캐시 - name: Cache Gradle packages uses: actions/cache@v3 diff --git a/build.gradle b/build.gradle index 3945910..15b931f 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,9 @@ dependencies { testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:mysql' testImplementation 'org.testcontainers:jdbc:1.19.7' - runtimeOnly 'org.springframework.boot:spring-boot-docker-compose' + if (project.hasProperty('local')) { + runtimeOnly 'org.springframework.boot:spring-boot-docker-compose' + } testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/compose-dev.yaml b/compose-dev.yaml deleted file mode 100644 index 452355c..0000000 --- a/compose-dev.yaml +++ /dev/null @@ -1,10 +0,0 @@ -services: - mysql: - image: 'mysql:latest' - environment: - MYSQL_DATABASE: ${{ secrets.DB_SCHEMA }} - MYSQL_PASSWORD: ${{ secrets.DB_PASSWORD }} - MYSQL_ROOT_PASSWORD: ${{ secrets.DB_PASSWORD }} - MYSQL_USER: ${{ secrets.DB_USERNAME }} - ports: - - '3306:3306' \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d27f84d..6f01da5 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -17,17 +17,6 @@ spring: dialect: org.hibernate.dialect.MySQLDialect defer-datasource-initialization: false - docker: - compose: - file: compose-dev.yaml - enabled: true - lifecycle-management: none - start: - command: up - stop: - command: down - timeout: 1m - logging: level: org: