chore: clarify docker dir

frouriojs · May 7, 2024 · 0a31bab · 0a31bab
1 parent de9d5e4
commit 0a31bab
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,6 @@ $ npm i --prefix server
 ```sh
 $ cp client/.env.example client/.env
 $ cp server/.env.example server/.env
-$ cp docker/dev/.env.example docker/dev/.env
 ```
 
 ### ミドルウェアのセットアップ

diff --git a/compose.yml b/compose.yml
@@ -1,12 +1,10 @@
 services:
   firebase:
-    build: ./docker/dev/firebase
+    build: ./docker/firebase
     restart: always
     ports:
       - 9099:9099 # Auth
       - 4000:4000 # Emulator Suite UI
-    env_file:
-      - ./docker/dev/.env
     working_dir: /opt/workspace
     command: firebase emulators:start --only=auth --project=emulator --import ./firebase-export --export-on-exit
 
@@ -17,13 +15,13 @@ services:
       - 9000:9000 # Storage
       - 9001:9001 # Console
     env_file:
-      - ./docker/dev/.env
+      - ./server/.env
     volumes:
-      - ./docker/dev/minio/data:/data
+      - minio:/data
     entrypoint: []
-    command: minio server /data --console-address :9001
+    command: minio server /data --address :9000 --console-address :9001
     healthcheck:
-      test: curl -I http://localhost:9000/minio/health/live
+      test: timeout 5s bash -c ':> /dev/tcp/127.0.0.1/9000' || exit 1
       interval: 5s
 
   mc:
@@ -32,27 +30,30 @@ services:
       minio:
         condition: service_healthy
     env_file:
-      - ./docker/dev/.env
       - ./server/.env
     entrypoint: []
     command: |
       sh -c "
-        set -euxo pipefail
         mc alias set myminio http://minio:9000 $$MINIO_ROOT_USER $$MINIO_ROOT_PASSWORD
         mc mb myminio/$$S3_BUCKET --region=$$S3_REGION || true
-        mc anonymous set download myminio/$$S3_BUCKET
+        mc mb myminio/$$TEST_S3_BUCKET --region=$$S3_REGION || true
       "
 
   postgres:
     image: postgres:13
     restart: always
     ports:
       - 5432:5432
-    env_file:
-      - ./docker/dev/.env
+    environment:
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: root
+      POSTGRES_DB: app
+      TZ: Asia/Tokyo
     volumes:
-      - database:/var/lib/postgresql/data
+      - postgres:/var/lib/postgresql/data
 
 volumes:
-  database:
+  minio:
+    driver: local
+  postgres:
     driver: local
diff --git a/docker/dev/.env.example b/docker/dev/.env.example
diff --git a/docker/dev/firebase/Dockerfile → docker/firebase/Dockerfile b/docker/dev/firebase/Dockerfile → docker/firebase/Dockerfile
diff --git a/docker/dev/firebase/firebase.json → docker/firebase/firebase.json b/docker/dev/firebase/firebase.json → docker/firebase/firebase.json
diff --git a/...firebase/seeder/auth_export/accounts.json → ...firebase/seeder/auth_export/accounts.json b/...firebase/seeder/auth_export/accounts.json → ...firebase/seeder/auth_export/accounts.json
diff --git a/...v/firebase/seeder/auth_export/config.json → ...r/firebase/seeder/auth_export/config.json b/...v/firebase/seeder/auth_export/config.json → ...r/firebase/seeder/auth_export/config.json
diff --git a/...base/seeder/firebase-export-metadata.json → ...base/seeder/firebase-export-metadata.json b/...base/seeder/firebase-export-metadata.json → ...base/seeder/firebase-export-metadata.json
diff --git a/server/.env.example b/server/.env.example
@@ -11,3 +11,5 @@ S3_SECRET_KEY=password
 S3_REGION=ap-northeast-1
 DATABASE_URL=postgresql://root:root@localhost:5432/app
 TEST_DATABASE_URL=postgresql://root:root@localhost:5432/test
+MINIO_ROOT_USER=minio
+MINIO_ROOT_PASSWORD=password