diff --git a/build.gradle b/build.gradle index a55caf3..7936eff 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,6 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-validation:2.7.3' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config:3.1.1' implementation 'org.springframework.cloud:spring-cloud-dependencies:2021.0.3' compileOnly 'org.projectlombok:lombok' runtimeOnly 'org.postgresql:postgresql' diff --git a/docker-compose.yml b/docker-compose.yml index b2092b3..ee758c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,15 +8,15 @@ services: build: context: . ports: - - 8080:8080 + - "8080:8080" depends_on: - postgres - - vault - - redis environment: - - spring_cloud_vault_uri=http://vault:8200 - - spring_cloud_vault_token=insert-your-TOKEN - spring_profiles_active=dev + - spring_datasource_password=gooseauth + - spring_datasource_url=jdbc:postgresql://postgres:5432/gooseauth + - spring_datasource_username=gooseauth + - spring_jpa_hibernate_ddl-auto=create - spring_redis_host=redis volumes: - ./volumes/api/logs:/volumes/api/logs @@ -25,7 +25,7 @@ services: image: postgres:13 container_name: goose-auth-api-postgres ports: - - 5431:5432 + - "5431:5432" environment: POSTGRES_USER: gooseauth POSTGRES_PASSWORD: gooseauth @@ -42,29 +42,15 @@ services: image: redis:latest container_name: goose-auth-api-redis ports: - - 6379:6379 + - "6379:6379" expose: - 6379 healthcheck: - test: ["CMD", "redis-cli", "ping"] + test: [ "CMD", "redis-cli", "ping" ] interval: 5s timeout: 30s retries: 50 restart: always - vault: - image: vault:latest - container_name: goose-auth-api-vault - ports: - - 8200:8200 - restart: always - volumes: - - ./volumes/logs:/vault/logs - - ./volumes/file:/vault/file - - ./volumes/config:/vault/config - cap_add: - - IPC_LOCK - entrypoint: vault server -config=/vault/config/vault.json - volumes: postgres-db-volume: diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 7d31dee..13e3f3b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -13,28 +13,20 @@ logging: spring: datasource: - username: vault - password: vault - url: vault + username: docker-compose-environment + password: docker-compose-environment + url: docker-compose-environment redis: - host: vault + host: docker-compose-environment port: 6379 timeout: 3000 - config: - import: vault:// - - cloud: - vault: - uri: http://localhost:8200 - token: insert-your-TOKEN - jpa: show-sql: true properties: hibernate: - ddl-auth: vault + ddl-auth: update default_batch_fetch_size: 1000 format_sql: true diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 67b561f..fee4dbd 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -7,28 +7,20 @@ logging: spring: datasource: - username: vault - password: vault - url: vault + username: docker-compose-environment + password: docker-compose-environment + url: docker-compose-environment redis: - host: localhost + host: vault port: 6379 timeout: 3000 - config: - import: vault:// - - cloud: - vault: - uri: http://localhost:8200 - token: insert-your-TOKEN - jpa: show-sql: true properties: hibernate: - ddl-auth: vault + ddl-auth: update default_batch_fetch_size: 1000 format_sql: true diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml index 3222368..8dfb40d 100644 --- a/src/test/resources/application.yml +++ b/src/test/resources/application.yml @@ -2,9 +2,6 @@ server: port: 8080 spring: - cloud: - vault: - enabled: false jpa: show-sql: true