Repo tweaks (#261)

Author: vertism

.github/workflows/test.yml

@@ -39,18 +39,6 @@ jobs:
         with:
           bundler-cache: true
 
-      - name: Find yarn cache location
-        id: yarn-cache
-        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
-
-      - name: JS package cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.yarn-cache.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
       - name: Install packages
         run: |
           yarn install --frozen-lockfile

Dockerfile

@@ -1,14 +1,21 @@
 # Build builder image
-FROM ruby:3.3.4-alpine as builder
+FROM ruby:3.3.4-alpine as base
 
 WORKDIR /app
 
+# tzdata: required to set timezone
+RUN apk --no-cache add \
+    tzdata \
+    postgresql-client
+
+# Ensure latest rubygems is installed
+RUN gem update --system
+
 # Install dependencies
 RUN apk --no-cache add \
     ruby-dev \
     build-base \
     postgresql-dev \
-    tzdata \
     yarn
 
 # Copy required files
@@ -35,16 +42,7 @@ RUN rm -rf node_modules log/* tmp/* /tmp && \
     rm -rf /usr/local/bundle/cache
 
 # Build runtime image
-FROM ruby:3.3.4-alpine
-
-# The application runs from /app
-WORKDIR /app
-
-# libpq: required to run postgres, tzdata: required to set timezone
-RUN apk --no-cache add \
-    libpq \
-    tzdata \
-    postgresql-client
+FROM base
 
 # Add non-root user and group with alpine first available uid, 1000
 RUN addgroup -g 1000 -S appgroup && \
@@ -56,16 +54,14 @@ COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
 
 # Create log and tmp
 RUN mkdir -p log tmp
-RUN chown -R appuser:appgroup db log tmp
+RUN chown -R appuser:appgroup ./*
 
 # Set user
 USER 1000
 
 ARG APP_BUILD_DATE
-ENV APP_BUILD_DATE ${APP_BUILD_DATE}
-
 ARG APP_BUILD_TAG
-ENV APP_BUILD_TAG ${APP_BUILD_TAG}
-
 ARG APP_GIT_COMMIT
+ENV APP_BUILD_DATE ${APP_BUILD_DATE}
+ENV APP_BUILD_TAG ${APP_BUILD_TAG}
 ENV APP_GIT_COMMIT ${APP_GIT_COMMIT}

README.md

@@ -79,6 +79,13 @@ Use the dev command to run the application. This will use Foreman to start the r
 $ bin/dev
 ```
 
+#### Running tests
+
+```
+$ bundle exec rspec
+```
+
+
 ## Admin
 The admin area is accessed via the path '/admin'.
 In production this is restricted to a set of allowed IP addresses which are stored in a secret in a semicolon delimited list.