dbの設定変更

Author: YuzukiEndo

Dockerfile

@@ -1,19 +1,21 @@
 FROM node:16-alpine as node
 ENV NODE_OPTIONS=--openssl-legacy-provider
+
 FROM ruby:3.3.1
 ENV LANG C.UTF-8
 ENV TZ Asia/Tokyo
 
-RUN apt-get update -qq \
-    && apt-get install -y ca-certificates curl gnupg \
+RUN apt-get update && apt-get install -y build-essential libpq-dev ca-certificates curl gnupg \
     && mkdir -p /etc/apt/keyrings \
     && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
     && NODE_MAJOR=18 \
     && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
-    && wget --quiet -O - /tmp/pubkey.gpg https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
     && apt-get update -qq \
-    && apt-get install -y build-essential default-mysql-client libssl-dev nodejs yarn
+    && apt-get install -y nodejs yarn \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir /recipi_ai_assistant
 WORKDIR /recipi_ai_assistant
@@ -29,4 +31,5 @@ RUN yarn install
 
 COPY . /recipi_ai_assistant
 
-CMD ["rails", "server", "-b", "0.0.0.0"]
+CMD ["rails", "server", "-b", "0.0.0.0"]
+

Gemfile

@@ -6,7 +6,8 @@ ruby '3.3.1'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
 gem 'rails', '~> 7.1.0'
 # Use postgresql as the database for Active Record
-gem 'mysql2', '~> 0.5'
+#gem 'mysql2', '~> 0.5'
+gem 'pg'
 # Use Puma as the app server
 gem 'puma', '~> 5.0'
 # Use SCSS for stylesheets

Gemfile.lock

@@ -176,7 +176,6 @@ GEM
       bigdecimal (~> 3.1)
     multipart-post (2.4.1)
     mutex_m (0.2.0)
-    mysql2 (0.5.6)
     net-http (0.4.1)
       uri
     net-imap (0.4.14)
@@ -214,6 +213,7 @@ GEM
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
+    pg (1.5.7)
     popper_js (2.11.8)
     psych (5.1.2)
       stringio
@@ -383,7 +383,7 @@ DEPENDENCIES
   jbuilder (~> 2.7)
   kaminari
   listen (~> 3.3)
-  mysql2 (~> 0.5)
+  pg
   puma (~> 5.0)
   rails (~> 7.1.0)
   rails-i18n

config/database.yml

@@ -1,11 +1,11 @@
 default: &default
-  adapter: mysql2
-  encoding: utf8mb4
+  adapter: postgresql
+  encoding: unicode
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  username: root
-  password: password  # Docker Composeで設定したMySQLのrootパスワード
-  host: db  # Docker Composeで定義されたMySQLサービス名
-  port: 3306
+  username: postgres
+  password: password
+  host: db 
+  port: 5432 
 
 development:
   <<: *default
@@ -19,4 +19,4 @@ production:
   <<: *default
   database: recipi_ai_assistant_production
   username: recipi_ai_assistant
-  password: <%= ENV['RECIPI_AI_ASSISTANT_DATABASE_PASSWORD'] %>
+  password: <%= ENV['RECIPI_AI_ASSISTANT_DATABASE_PASSWORD'] %>

db/schema.rb

@@ -11,13 +11,16 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema[7.1].define(version: 2024_08_05_045113) do
-  create_table "categories", charset: "utf8mb4", force: :cascade do |t|
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "categories", force: :cascade do |t|
     t.string "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "favorites", charset: "utf8mb4", force: :cascade do |t|
+  create_table "favorites", force: :cascade do |t|
     t.bigint "user_id", null: false
     t.bigint "recipe_id", null: false
     t.datetime "created_at", null: false
@@ -26,15 +29,15 @@
     t.index ["user_id"], name: "index_favorites_on_user_id"
   end
 
-  create_table "ingredients", charset: "utf8mb4", force: :cascade do |t|
+  create_table "ingredients", force: :cascade do |t|
     t.string "name"
     t.bigint "category_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["category_id"], name: "index_ingredients_on_category_id"
   end
 
-  create_table "recipes", charset: "utf8mb4", force: :cascade do |t|
+  create_table "recipes", force: :cascade do |t|
     t.string "name"
     t.integer "cooking_time_minutes"
     t.text "ingredients"
@@ -49,7 +52,7 @@
     t.string "category"
   end
 
-  create_table "users", charset: "utf8mb4", force: :cascade do |t|
+  create_table "users", force: :cascade do |t|
     t.string "email", null: false
     t.string "crypted_password"
     t.string "salt"

docker-compose.yml

@@ -1,15 +1,15 @@
 version: '3'
 services:
   db:
-    image: mysql:5.7
+    image: postgres:13
     platform: linux/amd64
     environment:
       TZ: Asia/Tokyo
-      MYSQL_ROOT_PASSWORD: password
+      POSTGRES_PASSWORD: password
     volumes:
-      - mysql_data:/var/lib/mysql
+      - postgres_data:/var/lib/postgresql/data
     ports:
-      - 3307:3306
+      - 5433:5432
 
   web:
     build: .
@@ -28,6 +28,7 @@ services:
       TZ: Asia/Tokyo
       SELENIUM_DRIVER_URL: http://chrome:4444/wd/hub
       NODE_OPTIONS: --openssl-legacy-provider
+      DATABASE_URL: postgres://postgres:password@db:5432/recipi_ai_assistant_development
     ports:
       - "3000:3000"
     depends_on:
@@ -41,6 +42,6 @@ services:
       - 4444:4444
 
 volumes:
-  mysql_data:
+  postgres_data:
   bundle_data:
-  node_modules:
+  node_modules: