Merge conflict

Author: maebeale

docker-compose.yml

@@ -7,6 +7,7 @@ services:
       - 3306
     volumes:
       - mysql-data:/var/lib/mysql
+      - ./docker/mysql/charset.cnf:/etc/mysql/conf.d/charset.cnf:ro
       - ./db/init:/docker-entrypoint-initdb.d
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
@@ -31,34 +32,20 @@ services:
       # If you prefer traditional keys, set DB_* in .env and configure database.yml accordingly.
       RAILS_ENV: development
       RAILS_LOG_TO_STDOUT: "true"
-      VITE_RUBY_HOST: vite
-      DATABASE_URL: trilogy://root@database:3306/
+      DATABASE_URL: trilogy://root@database:3306/?encoding=utf8mb4&collation=utf8mb4_unicode_ci&variables[collation_connection]=utf8mb4_unicode_ci
+
     ports:
       - 3000:3000
     volumes:
       - ./:/app:cached
       - /app/tmp
+    working_dir: /app
 
     command: bash -lc "bin/rails s -b 0.0.0.0 -p 3000"
     tty: true
     stdin_open: true
     restart: unless-stopped
 
-  vite:
-    build:
-      context: .
-      dockerfile: Dockerfile.dev
-    env_file: .env
-    environment:
-      RAILS_ENV: development
-      RAILS_LOG_TO_STDOUT: "true"
-      VITE_RUBY_HOST: 0.0.0.0
-    volumes:
-      - ./:/app:cached
-      - /app/tmp
-    command: bin/vite dev
-    ports:
-      - 3036:3036
 
   prod:
     profiles:

docker/mysql/charset.cnf

@@ -0,0 +1,3 @@
+[mysqld]
+character-set-server = utf8mb4
+collation-server     = utf8mb4_unicode_ci