Skip to content

Commit

Permalink
Merge branch 'dev/BE' into feat/708
Browse files Browse the repository at this point in the history
  • Loading branch information
cookienc committed Feb 17, 2024
2 parents 75a4342 + c622a2c commit 04aba5d
Show file tree
Hide file tree
Showing 34 changed files with 2,816 additions and 566 deletions.
4 changes: 3 additions & 1 deletion backend/baton/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java'
id 'java-test-fixtures'
id 'org.springframework.boot' version '3.1.1'
id 'org.springframework.boot' version '3.1.8'
id 'io.spring.dependency-management' version '1.1.0'
id 'org.asciidoctor.jvm.convert' version '3.3.2'
}
Expand Down Expand Up @@ -66,6 +66,7 @@ dependencies {
annotationProcessor 'org.projectlombok:lombok'

// database
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
runtimeOnly 'com.h2database:h2'
runtimeOnly 'com.mysql:mysql-connector-j'

Expand All @@ -79,6 +80,7 @@ dependencies {
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'io.rest-assured:rest-assured'
testImplementation 'org.testcontainers:junit-jupiter'
testImplementation 'org.testcontainers:testcontainers:1.17.2'
testImplementation 'org.springframework.boot:spring-boot-testcontainers'
testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
testImplementation 'org.testcontainers:mysql'
Expand Down
10 changes: 10 additions & 0 deletions backend/baton/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
services:
mysql:
image: 'mysql:latest'
container_name: 'baton-mysql'
environment:
- 'MYSQL_DATABASE=mydatabase'
- 'MYSQL_PASSWORD=secret'
- 'MYSQL_ROOT_PASSWORD=verysecret'
- 'MYSQL_USER=myuser'
ports:
- '3307:3306'
redis:
image: 'redis:7.0-alpine'
container_name: 'baton-redis'
ports:
- '16379:6379'
command: redis-server /usr/local/etc/redis/redis.conf
volumes:
- ./redis/redis.conf:/usr/local/etc/redis/redis.conf
- ./redis/users.acl:/etc/redis/users.acl
Loading

0 comments on commit 04aba5d

Please sign in to comment.