composeファイル名変更

NUTFes · Dec 24, 2024 · 043052d · 043052d
1 parent 592679a
commit 043052d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -15,15 +15,15 @@ down:
 
 # dbコンテナの起動(基本ずっと起動しておく)
 run-db:
-	docker compose -f docker-compose.db.yml up -d
+	docker compose -f compose.db.yml up -d
 
 # dbコンテナの停止(ずっと起動したくない時はこっちで停止)
 stop-db:
-	docker compose -f docker-compose.db.yml down
+	docker compose -f compose.db.yml down
 
 # ビルドと起動
 build-run:
-	docker compose -f docker-compose.db.yml up -d
+	docker compose -f compose.db.yml up -d
 	docker compose up --build
 
 # アプリコンテナボリュームの削除
@@ -32,7 +32,7 @@ del-vol:
 
 # 生成したコンテナ、イメージ、ボリューム、ネットワークを一括削除
 del-all:
-	docker-compose down --rmi all --volumes --remove-orphans
+	compose down --rmi all --volumes --remove-orphans
 
 # ボリューム削除→ビルド→起動
 run-rebuild:
@@ -41,7 +41,7 @@ run-rebuild:
 
 # dbとminioの停止とボリューム削除(dbを初期化したい時)
 del-db:
-	docker-compose -f docker-compose.db.yml down --volumes
+	compose -f compose.db.yml down --volumes
 
 # apiの起動(db起動後)
 run-api:
@@ -57,13 +57,13 @@ seed:
 
 # 本番環境デプロイ
 deploy:
-	docker compose -f docker-compose.prod.yml build
-	docker compose -f docker-compose.prod.yml up -d
+	docker compose -f compose.prod.yml build
+	docker compose -f compose.prod.yml up -d
 
 # ローカルで本番設定で起動
 run-prod:
-	docker compose -f docker-compose.local-prod.yml build
-	docker compose -f docker-compose.local-prod.yml up
+	docker compose -f compose.local-prod.yml build
+	docker compose -f compose.local-prod.yml up
 
 # DB入るコマンド
 ent-db:
@@ -74,7 +74,7 @@ run-eslint:
 	docker compose exec view npm run lint
 
 generate-openapi:
-	docker compose run --rm api oapi-codegen -config /openapi/generated/config.yaml /openapi/generated/openapi.yaml
+	docker compose run --rm api oapi-codegen -config /openapi/generated/config.yaml /openapi/openapi.yaml
 
 run-swagger:
 	docker compose -f compose.swagger.yml up -d

diff --git a/docker-compose.db.yml → compose.db.yml b/docker-compose.db.yml → compose.db.yml
diff --git a/docker-compose.local-prod.yml → compose.local-prod.yml b/docker-compose.local-prod.yml → compose.local-prod.yml
diff --git a/docker-compose.prod.yml → compose.prod.yml b/docker-compose.prod.yml → compose.prod.yml
diff --git a/docker-compose.yml → compose.yml b/docker-compose.yml → compose.yml
diff --git a/mysql/db/year_periods.sql b/mysql/db/year_periods.sql
@@ -12,3 +12,4 @@ CREATE TABLE year_periods (
 
 INSERT INTO  year_periods (year_id, started_at, ended_at) values (1, '2022-11-15 00:00:00', '2023-11-15 00:00:00');
 INSERT INTO  year_periods (year_id, started_at, ended_at) values (2, '2023-11-15 00:00:00', '2024-11-15 00:00:00');
+INSERT INTO  year_periods (year_id, started_at, ended_at) values (3, '2024-11-15 00:00:00', '2025-11-15 00:00:00');
diff --git a/mysql/db/years.sql b/mysql/db/years.sql
@@ -10,3 +10,4 @@ CREATE TABLE years (
 
 INSERT into years (year) values (2023);
 INSERT into years (year) values (2024);
+INSERT into years (year) values (2025);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ CREATE TABLE year_periods (

		INSERT INTO year_periods (year_id, started_at, ended_at) values (1, '2022-11-15 00:00:00', '2023-11-15 00:00:00');
		INSERT INTO year_periods (year_id, started_at, ended_at) values (2, '2023-11-15 00:00:00', '2024-11-15 00:00:00');
		INSERT INTO year_periods (year_id, started_at, ended_at) values (3, '2024-11-15 00:00:00', '2025-11-15 00:00:00');
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ CREATE TABLE years (

		INSERT into years (year) values (2023);
		INSERT into years (year) values (2024);
		INSERT into years (year) values (2025);