Skip to content

Commit

Permalink
Merge pull request #11 from traPtitech/testing-refactor
Browse files Browse the repository at this point in the history
テスト周りのリファクタ
  • Loading branch information
cp-20 authored Dec 19, 2024
2 parents c6f241f + 62c536a commit f6a1676
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
13 changes: 12 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ management tool for equipment and book rental

## Development environment

### Setup with docker and docker-compose
### Setup with docker (compose)

#### First Up (or entirely rebuild)

Expand Down Expand Up @@ -38,3 +38,14 @@ $ docker compose -f docker/test/docker-compose.yml up --abort-on-container-exit

`docker compose down -v`

### Setup VSCode

write it down in your `.vscode/settings.json`

```json
{
"go.testEnvVars": {
"MYSQL_DATABASE": "test"
}
}
```
7 changes: 0 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ services:
MYSQL_USERNAME: root
MYSQL_PASSWORD: password
volumes:
- booq-db:/var/lib/mysql
- ./docker/init.sql:/docker-entrypoint-initdb.d/init.sql
expose:
- '3306'
Expand All @@ -31,8 +30,6 @@ services:
MINIO_ROOT_PASSWORD: password
MINIO_ACCESS_KEY: minio_access_key
MINIO_SECRET_KEY: minio_secret_key
volumes:
- booq-s3:/data
s3-init:
image: minio/mc
depends_on:
Expand Down Expand Up @@ -81,7 +78,3 @@ services:
restart: always
ports:
- 8000:8080

volumes:
booq-db:
booq-s3:
2 changes: 2 additions & 0 deletions docker/init.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ SET

SET
collation_server = 'utf8mb4_general_ci';

CREATE DATABASE IF NOT EXISTS `test`;
File renamed without changes.

0 comments on commit f6a1676

Please sign in to comment.