update with project-syncing action

Author: github-actions

.devcontainer/devcontainer.json

@@ -2,8 +2,18 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/universal
 {
   "name": "Container",
-  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-  "image": "firstdraft/appdev-rails-8-template",
+  "dockerComposeFile": "docker-compose.yml", // Location of docker-compose.yml file
+  "service": "devcontainer", // Where the image is specified in the docker-compose.yml
+  "workspaceFolder": "/workspaces/ajax-with-magic", // Where to mount the workspace folder
+
+  // Container environment variables to ensure database connection works
+  "containerEnv": {
+    "PGHOST": "localhost",
+    "PGUSER": "student",
+    "PGPASSWORD": "postgres",
+    "PGDATABASE": "postgres",
+    "DATABASE_URL": "postgres://student:postgres@localhost:5432/ajax_with_magic?encoding=utf8&pool=5&timeout=5000"
+  },
 
   // Features to add to the dev container. More info: https://containers.dev/features.
   // "features": {},

.devcontainer/docker-compose.yml

@@ -0,0 +1,27 @@
+services:
+  devcontainer:
+    image: firstdraft/appdev-rails-8-template
+    volumes:
+      - ../..:/workspaces:cached
+    network_mode: service:db
+    command: sleep infinity
+
+  db:
+    image: postgres:16.9
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: student
+      POSTGRES_DB: postgres
+  
+  redis:
+    image: redis:latest
+    restart: unless-stopped
+    volumes:
+      - redis-data:/var/lib/redis/data
+
+volumes:
+  postgres-data:
+  redis-data:

appdev.rails8.Dockerfile

@@ -64,26 +64,6 @@ RUN /bin/bash -l -c "bundle config set --local path '/home/student/.bundle' && b
     && sudo apt-get update \
     && sudo apt-get install -y postgresql-16 postgresql-contrib-16
 
-# Setup PostgreSQL configuration
-ENV PATH="$PATH:/usr/lib/postgresql/16/bin" PGDATA="/workspaces/.pgsql/data"
-RUN sudo mkdir -p $PGDATA \
-    && mkdir -p ~/.pg_ctl/bin ~/.pg_ctl/sockets \
-    && printf '#!/bin/bash\n[ ! -d $PGDATA ] && mkdir -p $PGDATA && initdb -D $PGDATA\npg_ctl -D $PGDATA -l ~/.pg_ctl/log -o "-k ~/.pg_ctl/sockets" start\n' > ~/.pg_ctl/bin/pg_start \
-    && printf '#!/bin/bash\npg_ctl -D $PGDATA -l ~/.pg_ctl/log -o "-k ~/.pg_ctl/sockets" stop\n' > ~/.pg_ctl/bin/pg_stop \
-    && chmod +x ~/.pg_ctl/bin/* \
-    && sudo addgroup dev \
-    && sudo adduser student dev \
-    && sudo chgrp -R dev $PGDATA \
-    && sudo chmod -R 775 $PGDATA \
-    && sudo setfacl -dR -m g:staff:rwx $PGDATA \
-    && sudo chmod 777 /var/run/postgresql \
-    # This is a bit of a hack. At the moment we have no means of starting background
-    # tasks from a Dockerfile. This workaround checks, on each bashrc eval, if the
-    # PostgreSQL server is running, and if not starts it.
-    && printf "\n# Auto-start PostgreSQL server.\n[[ \$(pg_ctl status | grep PID) ]] || pg_start > /dev/null\n" >> ~/.bashrc
-ENV PATH="$PATH:$HOME/.pg_ctl/bin" PGHOSTADDR="127.0.0.1" PGDATABASE="postgres"
-
-
 RUN curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - \
     # Install Node.js and Yarn
     && sudo apt-get install -y nodejs \
@@ -128,7 +108,6 @@ __git_complete g __git_main" >> ~/.bash_aliases \
     && echo "alias grade='rake grade'" >> ~/.bash_aliases \
     && echo "alias grade:reset_token='rake grade:reset_token'" >> ~/.bash_aliases \
     && echo 'export PATH="$PWD/bin:$PATH"' >> ~/.bashrc \
-    && echo "nohup /workspaces/*/bin/postgres-monitor > /dev/null 2>&1 &" >> ~/.bashrc \
     && echo "# Configure bundler and RVM paths" >> ~/.bashrc \
     && echo 'export BUNDLE_PATH="/home/student/.bundle"' >> ~/.bashrc \
     && echo 'export GEM_HOME="/home/student/.rvm/gems/ruby-3.4.1"' >> ~/.bashrc \

bin/server

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-if pg_ctl status | grep -q 'no server running'; then
-  pg_start;
-fi
-
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 parentdir="$(dirname "$DIR")"
 pid="$parentdir/tmp/pids/server.pid"

bin/setup

@@ -33,4 +33,8 @@ FileUtils.chdir APP_ROOT do
 
   puts "\n== Checking for JavaScript tests and installing chromedriver if needed =="
   system! "bin/chromedriver_check"
+
+  puts "\n== Creating test database =="
+  system! "bin/rails db:create RAILS_ENV=test"
+  puts "\n== Initial setup complete =="
 end

config/database.yml

@@ -21,30 +21,17 @@ default: &default
 
 
 development:
-  primary: &primary_development
-    <<: *default
-    database: rails_8_template_development
-  cache:
-    <<: *primary_development
-    database: rails_8_template_development_cache
-    migrations_paths: db/cache_migrate
-  queue:
-    <<: *primary_development
-    database: rails_8_template_development_queue
-    migrations_paths: db/queue_migrate
-  cable:
-    <<: *primary_development
-    database: rails_8_template_development_cable
-    migrations_paths: db/cable_migrate
+  <<: *default
+  url: <%= ENV.fetch("DATABASE_URL").gsub("?", "_development?") %>
 
   # The specified database role being used to connect to PostgreSQL.
   # To create additional roles in PostgreSQL see `$ createuser --help`.
   # When left blank, PostgreSQL will use the default role. This is
   # the same name as the operating system user running Rails.
-  #username: rails_8_template
+  #username: student
 
   # The password associated with the PostgreSQL role (username).
-  #password:
+  #password: postgres
 
   # Connect on a TCP socket. Omitted by default since the client uses a
   # domain socket that doesn't need configuration. Windows does not have
@@ -69,7 +56,7 @@ development:
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: rails_8_template_test
+  url: <%= ENV.fetch("DATABASE_URL").gsub("?", "_test?") %>
 
 # As with config/credentials.yml, you never want to store sensitive information,
 # like your database password, in your source code. If your source code is
@@ -98,13 +85,13 @@ production:
     encoding: utf8
   cache:
     <<: *primary_production
-    database: rails_8_template_production_cache
+    database: database_production_cache
     migrations_paths: db/cache_migrate
   queue:
     <<: *primary_production
-    database: rails_8_template_production_queue
+    database: database_production_queue
     migrations_paths: db/queue_migrate
   cable:
     <<: *primary_production
-    database: rails_8_template_production_cable
+    database: database_production_cable
     migrations_paths: db/cable_migrate