From 043052de5f59987fab1b83cd608a18b4b1a30df9 Mon Sep 17 00:00:00 2001 From: Kubosaka Date: Tue, 24 Dec 2024 14:10:30 +0900 Subject: [PATCH] =?UTF-8?q?compose=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E5=90=8D=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 20 +++++++++---------- docker-compose.db.yml => compose.db.yml | 0 ...e.local-prod.yml => compose.local-prod.yml | 0 docker-compose.prod.yml => compose.prod.yml | 0 docker-compose.yml => compose.yml | 0 mysql/db/year_periods.sql | 1 + mysql/db/years.sql | 1 + 7 files changed, 12 insertions(+), 10 deletions(-) rename docker-compose.db.yml => compose.db.yml (100%) rename docker-compose.local-prod.yml => compose.local-prod.yml (100%) rename docker-compose.prod.yml => compose.prod.yml (100%) rename docker-compose.yml => compose.yml (100%) diff --git a/Makefile b/Makefile index f90c1bf63..6b90c3884 100644 --- 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 b/compose.db.yml similarity index 100% rename from docker-compose.db.yml rename to compose.db.yml diff --git a/docker-compose.local-prod.yml b/compose.local-prod.yml similarity index 100% rename from docker-compose.local-prod.yml rename to compose.local-prod.yml diff --git a/docker-compose.prod.yml b/compose.prod.yml similarity index 100% rename from docker-compose.prod.yml rename to compose.prod.yml diff --git a/docker-compose.yml b/compose.yml similarity index 100% rename from docker-compose.yml rename to compose.yml diff --git a/mysql/db/year_periods.sql b/mysql/db/year_periods.sql index 0cb6ce15f..6192199ef 100644 --- 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 index d1c8f8871..3a2c5b7d0 100644 --- 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);