Merge branch 'dev/BE' into deploy/merge

woowacourse-teams · Feb 19, 2024 · cf9e27e · cf9e27e
2 parents a31eac8 + 3428bfe
commit cf9e27e
Show file tree

Hide file tree

Showing 78 changed files with 3,648 additions and 702 deletions.
diff --git a/.github/workflows/dev-be-ci-cd-push.yml b/.github/workflows/dev-be-ci-cd-push.yml
diff --git a/backend/baton/build.gradle b/backend/baton/build.gradle
@@ -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'
 }
@@ -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'
 
@@ -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'

diff --git a/backend/baton/docker-compose.yaml b/backend/baton/docker-compose.yaml
@@ -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