Merge pull request #127 from kc3hack/hayato/develop

Hayato/develop

Author: ABfry

Diff for: Makefile

@@ -22,38 +22,5 @@ sb:
 	cd frontend && npm run storybook
 
 
-# ECR
 
 
-# ECR URLの定義
-FRONT_ECR_URL := $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(FRONT_IMAGE_NAME)
-BACK_ECR_URL := $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(BACK_IMAGE_NAME)
-UUID := $(shell uuidgen)
-
-login-ecr:
-	aws ecr get-login-password --region $(AWS_REGION) | docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com
-
-build-ecr-front: 
-	docker build --platform linux/amd64 -t $(FRONT_IMAGE_NAME) -f ./frontend/Dockerfile ./frontend
-
-build-ecr-back: 
-	docker build --platform linux/amd64 -t $(BACK_IMAGE_NAME) -f ./backend/Dockerfile ./backend
-
-tag-ecr: build-ecr-front build-ecr-back
-	docker tag $(FRONT_IMAGE_NAME):$(TAG) $(FRONT_ECR_URL):$(TAG)
-	docker tag $(BACK_IMAGE_NAME):$(TAG) $(BACK_ECR_URL):$(TAG)
-
-push-ecr: tag-ecr
-	docker push $(FRONT_ECR_URL):$(TAG)
-	docker push $(BACK_ECR_URL):$(TAG)
-
-tag-ecr-uuid: build-ecr-front build-ecr-back
-	docker tag $(FRONT_IMAGE_NAME):$(TAG) $(FRONT_ECR_URL):$(UUID)
-	docker tag $(BACK_IMAGE_NAME):$(TAG) $(BACK_ECR_URL):$(UUID)
-
-push-ecr-uuid: tag-ecr-uuid
-	docker push $(FRONT_ECR_URL):$(UUID)
-	docker push $(BACK_ECR_URL):$(UUID)
-
-ecr: login-ecr build-ecr-front build-ecr-back tag-ecr tag-ecr-uuid push-ecr push-ecr-uuid
-

Diff for: frontend/src/app/layout.tsx

@@ -23,7 +23,7 @@ const notoSerifJP = Noto_Serif_JP({
 
 export const metadata: Metadata = {
   title: 'Tankalizer',
-  description: 'Tankalizer',
+  description: '投稿したつぶやきが短歌に!?新感覚SNS Tankalizer(タンカライザー)',
 };
 
 export default function RootLayout({

Diff for: infra/db/docker-compose.yaml

@@ -0,0 +1,33 @@
+version: "3"
+
+services:
+  db:
+    image: mysql/mysql-server:8.0
+    container_name: kc3_mysql
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: mydatabase
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+    volumes:
+      - db_data:/var/lib/mysql
+    ports:
+      - "3306:3306"
+
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    container_name: kc3_mysql_phpmyadmin
+    restart: always
+    environment:
+      PMA_HOST: db
+      PMA_PORT: 3306
+      PMA_USER: ${MYSQL_USER}
+      PMA_PASSWORD: ${MYSQL_PASSWORD}
+    ports:
+      - "8080:80"
+    depends_on:
+      - db
+
+volumes:
+  db_data:

Diff for: infra/ecr/Makefile

@@ -0,0 +1,34 @@
+# ECR
+
+
+# ECR URLの定義
+FRONT_ECR_URL := $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(FRONT_IMAGE_NAME)
+BACK_ECR_URL := $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/$(BACK_IMAGE_NAME)
+UUID := $(shell uuidgen)
+
+login-ecr:
+	aws ecr get-login-password --region $(AWS_REGION) | docker login --username AWS --password-stdin $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com
+
+build-ecr-front: 
+	docker build --platform linux/amd64 -t $(FRONT_IMAGE_NAME) -f ./frontend/Dockerfile ./frontend
+
+build-ecr-back: 
+	docker build --platform linux/amd64 -t $(BACK_IMAGE_NAME) -f ./backend/Dockerfile ./backend
+
+tag-ecr: build-ecr-front build-ecr-back
+	docker tag $(FRONT_IMAGE_NAME):$(TAG) $(FRONT_ECR_URL):$(TAG)
+	docker tag $(BACK_IMAGE_NAME):$(TAG) $(BACK_ECR_URL):$(TAG)
+
+push-ecr: tag-ecr
+	docker push $(FRONT_ECR_URL):$(TAG)
+	docker push $(BACK_ECR_URL):$(TAG)
+
+tag-ecr-uuid: build-ecr-front build-ecr-back
+	docker tag $(FRONT_IMAGE_NAME):$(TAG) $(FRONT_ECR_URL):$(UUID)
+	docker tag $(BACK_IMAGE_NAME):$(TAG) $(BACK_ECR_URL):$(UUID)
+
+push-ecr-uuid: tag-ecr-uuid
+	docker push $(FRONT_ECR_URL):$(UUID)
+	docker push $(BACK_ECR_URL):$(UUID)
+
+ecr: login-ecr build-ecr-front build-ecr-back tag-ecr tag-ecr-uuid push-ecr push-ecr-uuid