Merge pull request #89 from PhlexUI/cirdes/move-to-sqlite-and-fly

Switch to SQLite3, Upgrade Ruby and Rails, Remove Unused Gems, and Add Fly.io Deployment Configuration

Author: sethhorsley

.devcontainer/Dockerfile

@@ -1,3 +1,3 @@
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version
-ARG RUBY_VERSION=3.3.0
+ARG RUBY_VERSION=3.3.4
 FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION

.devcontainer/compose.yaml

@@ -24,34 +24,9 @@ services:
     - 45678:45678
     depends_on:
     - selenium
-    - redis
-    - postgres
 
   selenium:
     image: seleniarm/standalone-chromium
     restart: unless-stopped
     networks:
     - default
-
-  redis:
-    image: redis:7.2
-    restart: unless-stopped
-    networks:
-    - default
-    volumes:
-    - redis-data:/data
-
-  postgres:
-    image: postgres:16.1
-    restart: unless-stopped
-    networks:
-    - default
-    volumes:
-    - postgres-data:/var/lib/postgresql/data
-    environment:
-        POSTGRES_USER: postgres
-        POSTGRES_PASSWORD: postgres
-
-volumes:
-  redis-data:
-  postgres-data:

.devcontainer/devcontainer.json

@@ -10,19 +10,17 @@
   "features": {
     "ghcr.io/devcontainers/features/github-cli:1": {},
     "ghcr.io/rails/devcontainer/features/activestorage": {},
-    "ghcr.io/rails/devcontainer/features/postgres-client": {},
-    "ghcr.io/devcontainers/features/node:1": { "version": 20 }
+    "ghcr.io/devcontainers/features/node:1": { "version": 20 },
+    "ghcr.io/rails/devcontainer/features/sqlite3": {}
   },
 
   "containerEnv": {
     "CAPYBARA_SERVER_PORT": "45678",
-    "SELENIUM_HOST": "selenium",
-    "REDIS_URL": "redis://redis:6379/1",
-    "DB_HOST": "postgres"
+    "SELENIUM_HOST": "selenium"
   },
 
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  "forwardPorts": [3000, 5432, 6379],
+  "forwardPorts": [3000, 6379],
 
   // Configure tool-specific properties.
   // "customizations": {},

.dockerignore

@@ -0,0 +1,37 @@
+# See https://docs.docker.com/engine/reference/builder/#dockerignore-file for more about ignoring files.
+
+# Ignore git directory.
+/.git/
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all environment files (except templates).
+/.env*
+!/.env*.erb
+
+# Ignore all default key files.
+/config/master.key
+/config/credentials/*.key
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/.keep
+
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+!/storage/.keep
+/tmp/storage/*
+!/tmp/storage/.keep
+
+# Ignore assets.
+/node_modules/
+/app/assets/builds/*
+!/app/assets/builds/.keep
+/public/assets

.github/workflows/fly-deploy.yml

@@ -0,0 +1,18 @@
+# See https://fly.io/docs/app-guides/continuous-deployment-with-github-actions/
+
+name: Fly Deploy
+on:
+  push:
+    branches:
+      - main
+jobs:
+  deploy:
+    name: Deploy app
+    runs-on: ubuntu-latest
+    concurrency: deploy-group    # optional: ensure only one action runs at a time
+    steps:
+      - uses: actions/checkout@v4
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - run: flyctl deploy --remote-only
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

.github/workflows/main.yml

@@ -40,28 +40,6 @@ jobs:
   test:
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres:latest
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: test
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      redis:
-        image: redis
-        ports: ["6379:6379"]
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
     steps:
       - uses: actions/checkout@v4
 
@@ -73,7 +51,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version-file: ".tool-versions"
+          node-version-file: ".node-version"
           cache: yarn
 
       - name: Install dependencies
@@ -84,8 +62,6 @@ jobs:
 
       - name: Run tests
         env:
-          DATABASE_URL: postgres://postgres:password@localhost:5432/test
-          REDIS_URL: redis://localhost:6379/0
           RAILS_ENV: test
           # RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
         run: |

.gitignore

@@ -36,3 +36,6 @@
 /node_modules
 
 .env*
+
+/.yarn/*
+.yarnrc

.node-version

@@ -0,0 +1 @@
+20.10.0

.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.4