Apply stashed changes and resolve schema conflict

Author: matmanna

DEVELOPMENT.md

@@ -59,14 +59,16 @@ Run the Vite build with SSR (server-side-rendering):
 app# bin/vite build --ssr
 ```
 
-Now, let's start up the app! Run this _outside your container's shell:_
+Now, let's start up the app! Run this command on your host machine (not inside the container shell). The `app#` prompt indicates container-shell commands; for host commands, use your normal shell prompt:
 
 ```bash
-app# bin/dev
+$ bin/dev
 ```
 
 Want to do other things?
 
+Run these in your container shell:
+
 ```bash
 app# bin/rails c # start an interactive irb!
 app# bin/rails db:migrate # migrate the database

Dockerfile.dev

@@ -66,7 +66,7 @@ ENTRYPOINT ["entrypoint.dev.sh"]
 RUN git config --system http.timeout 30 && \
     git config --system http.lowSpeedLimit 1000 && \
     git config --system http.lowSpeedTime 10
-EXPOSE 3000
+EXPOSE 3001
 EXPOSE 3036
 
 # Disable dev warnings

bin/dev

@@ -5,7 +5,7 @@ set -e
 # (or whatever process manager is available). Detection: the docker entrypoint
 # sets RUNNING_INSIDE_CONTAINER, and /.dockerenv exists in every container.
 if [ -n "$RUNNING_INSIDE_CONTAINER" ] || [ -f /.dockerenv ]; then
-  export PORT="${PORT:-3000}"
+  export PORT="${PORT:-3001}"
 
   if ! gem list -i --exact foreman >/dev/null; then
     echo "Installing foreman..."

config/environments/development.rb

@@ -54,7 +54,7 @@
   config.action_mailer.perform_caching = false
 
   # Set localhost to be used by links generated in mailer templates.
-  config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
+  config.action_mailer.default_url_options = { host: "localhost", port: 3001 }
 
   # Preview emails in the browser [https://github.com/ryanb/letter_opener]
   config.action_mailer.delivery_method = :letter_opener

db/schema.rb

@@ -4,7 +4,7 @@ services:
       context: .
       dockerfile: Dockerfile.dev
     ports:
-      - "3000:3000"
+      - "3001:3001"
       - "3036:3036"
     volumes:
       - .:/app