Skip to content

Commit

Permalink
Merge branch 'main' into feat/#15_belljun3395
Browse files Browse the repository at this point in the history
  • Loading branch information
belljun3395 authored Jun 8, 2024
2 parents 64f8289 + a9eba9b commit c81f595
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 7 deletions.
5 changes: 1 addition & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,7 @@ subprojects {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")

/** logger */
implementation("net.logstash.logback:logstash-logback-encoder:${DependencyVersion.LOGBACK_ENCODER}")


/** test **/
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("io.mockk:mockk:${DependencyVersion.MOCKK}")
Expand Down
3 changes: 0 additions & 3 deletions buildSrc/src/main/kotlin/DependencyVersion.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ object DependencyVersion {
/** springDependencyManagementVersion */
const val SPRING_DEPENDENCY_MANAGEMENT = "1.1.5"

/** log */
const val LOGBACK_ENCODER = "7.4"

/** test */
const val MOCKK = "1.13.9"
const val KOTEST = "5.8.0"
Expand Down
25 changes: 25 additions & 0 deletions resources/local-develop-environment/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: '3.1'
services:
few-mysql:
container_name: few-mysql8
image: mysql/mysql-server:8.0.27
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_ROOT_HOST=%
- TZ=Asia/Seoul
command: [ "--character-set-server=utf8mb4", "--collation-server=utf8mb4_unicode_ci", "--lower_case_table_names=1", "--max_connections=2048", "--wait_timeout=3600" ]
ports:
- "13306:3306"
volumes:
- ./mysql-init.d:/docker-entrypoint-initdb.d

few-adminer: # mysql web admin
container_name: few-adminer
image: adminer:4
ports:
- "18080:8080"
environment:
- ADMINER_DEFAULT_SERVER=few-mysql8
- ADMINER_DESIGN=nette
- ADMINER_PLUGINS=tables-filter tinymce

13 changes: 13 additions & 0 deletions resources/local-develop-environment/mysql-init.d/00_init.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
CREATE
USER 'few-local'@'localhost' IDENTIFIED BY 'few-local';
CREATE
USER 'few-local'@'%' IDENTIFIED BY 'few-local';

GRANT ALL PRIVILEGES ON *.* TO
'few-local'@'localhost';
GRANT ALL PRIVILEGES ON *.* TO
'few-local'@'%';

CREATE
DATABASE api DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE
6 changes: 6 additions & 0 deletions scripts/local-develop-env-reset
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

cd ../resources/local-develop-environment
docker-compose down
docker-compose up -d
sleep 10

0 comments on commit c81f595

Please sign in to comment.