Use docker compose for github actions

.env.sample

@@ -1,7 +1,7 @@
 REVERSER_DATA_PATH=
 # Change the ports that are forwarded by docker to avoid potential conflicts
-EXPOSED_SERVER_PORT=9000
-EXPOSED_POSTGRES_PORT=34518
-EXPOSED_VNC_PORT=7900
+# EXPOSED_SERVER_PORT=
+# EXPOSED_POSTGRES_PORT=
+# EXPOSED_VNC_PORT=
 # Uncomment if you want to do development with vscode+solargraph
 # COMPOSE_PROFILES=solargraph

.github/prepare-docker-image/action.yml

@@ -15,5 +15,5 @@ runs:
         tags: reverser:test
 
     - name: Set docker run command
-      run: echo "DOCKER_RUN=docker run --rm --network host -e POSTGRES_HOST=localhost -e EXPOSED_VNC_PORT=123 -e RAILS_ENV=test -e CI=true -v $PWD:/app reverser:test" >> "$GITHUB_ENV"
+      run: echo "DOCKER_RUN=docker compose run --rm -e REVERSER_DATA_PATH=dummy -e CI=true" >> "$GITHUB_ENV"
       shell: bash

.github/workflows/checks.yml

@@ -30,31 +30,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: docker-build
 
-    services:
-      postgres:
-        image: postgres:15-alpine
-        env:
-          POSTGRES_USER: reverser
-          POSTGRES_DB: reverser_test
-          POSTGRES_HOST_AUTH_METHOD: trust
-        ports:
-          - 5432:5432
-        options: >-
-          --mount type=tmpfs,destination=/var/lib/postgresql/data
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/prepare-docker-image
 
-      - name: Create DB
-        run: $DOCKER_RUN bin/rails db:schema:load
-
       - name: Run Tests
-        run: $DOCKER_RUN bundle exec rails test
+        run: docker compose run --rm -e REVERSER_DATA_PATH=dummy -e CI=true tests
 
   rubocop:
     runs-on: ubuntu-latest
@@ -65,7 +46,7 @@ jobs:
       - uses: ./.github/prepare-docker-image
 
       - name: Run Rubocop
-        run: $DOCKER_RUN bundle exec rubocop --format github
+        run: $DOCKER_RUN rubocop --format github
 
   yamllint:
     runs-on: ubuntu-latest

docker-compose.yml

@@ -1,5 +1,10 @@
 version: "3"
 
+x-environment: &common-env
+  EXPOSED_VNC_PORT: ${EXPOSED_VNC_PORT:-7900}
+  IQDB_URL: ${IQDB_URL:-http://iqdb:5588}
+  SELENIUM_URL: ${SELENIUM_URL:-http://selenium:4444}
+
 services:
   reverser:
     build:
@@ -8,9 +13,7 @@ services:
         COMPOSE_PROFILES: ${COMPOSE_PROFILES-}
     image: reverser
     environment:
-      EXPOSED_VNC_PORT: ${EXPOSED_VNC_PORT:?}
-      IQDB_URL: ${IQDB_URL:-http://iqdb:5588}
-      SELENIUM_URL: ${SELENIUM_URL:-http://selenium:4444}
+      <<: *common-env
     volumes:
       - .:/app
       - build_assets:/app/public/build
@@ -27,7 +30,7 @@ services:
       - iqdb
       - selenium
     ports:
-      - ${EXPOSED_SERVER_PORT:?}:9000
+      - ${EXPOSED_SERVER_PORT:-9000}:9000
     command: foreman start --color
 
   solargraph:
@@ -51,7 +54,7 @@ services:
       - ${REVERSER_DATA_PATH:?}/db_data:/var/lib/postgresql/data
     shm_size: 256mb
     ports:
-      - ${EXPOSED_POSTGRES_PORT:?}:5432
+      - ${EXPOSED_POSTGRES_PORT:-34518}:5432
 
   iqdb:
     image: ghcr.io/e621ng/iqdb:d4fed9d9a51184e72d2f14d4ec461d7830bd177a
@@ -64,7 +67,7 @@ services:
       - VNC_NO_PASSWORD=1
     shm_size: 2gb
     ports:
-      - ${EXPOSED_VNC_PORT:?}:7900
+      - ${EXPOSED_VNC_PORT:-7900}:7900
 
   # Profiles for standalone things
 
@@ -80,7 +83,7 @@ services:
   tests:
     image: reverser
     environment:
-      EXPOSED_VNC_PORT: "123"
+      <<: *common-env
     volumes:
       - .:/app
     entrypoint: bundle exec rails test