Skip to content

Commit

Permalink
Merge pull request #32 from MARU-EGG/test-container-localize
Browse files Browse the repository at this point in the history
chore: test 환경 설정
  • Loading branch information
Hoya324 authored Jul 1, 2024
2 parents b21b3ed + 1fecc01 commit 38225bd
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 30 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
10 changes: 0 additions & 10 deletions compose-dev.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 38225bd

Please sign in to comment.