Merge pull request #4 from tulibraries/IMT-28-CircleCI-Configuration

IMT-28 CircleCI Configuration

Author: nomadicoder

.circleci/config.yml

@@ -1,54 +1,40 @@
 version: 2.1
 
 workflows:
+  version: 2
   run_tests:
     jobs:
       - lint_and_test
 
-orbs:
-  coveralls: coveralls/[email protected]
-
 jobs:
   lint_and_test:
     docker:
-      - image: cimg/ruby:3.4.3-node
+      - image: cimg/ruby:3.4-node
         auth:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_PASSWORD
     steps:
       - checkout
 
-      - setup_remote_docker:
-          docker_layer_caching: false
-
-      - run: if [ -e /var/run/docker.sock ]; then sudo chown circleci:circleci /var/run/docker.sock; fi
-
       - run:
-          name: remove dockerignore
-          command: rm .dockerignore
+          name: make sure we have the latest bundler
+          command: |
+            sudo gem update --system
+            gem install -f bundler:2.1.4
 
       - run:
-          name: Build docker containers
-          command: |
-            source .env && docker-compose -p isilon_tracker -f docker-compose.yaml up -d
-            sleep 30
+          name: Build app
+          command: make up
 
       - run:
           name: Run linter
-          command: |
-              docker-compose -p isilon_tracker -f docker-compose.yaml exec --user root test_app bundle exec  rubocop -c .rubocop.yml
+          command: make lint
 
       - run:
-          name: Database migrations
-          command: |
-              docker-compose -p isilon_tracker -f docker-compose.yaml exec --user root test_app bundle exec rails db:setup
-              docker-compose -p isilon_tracker -f docker-compose.yaml exec --user root test_app bundle exec rails db:migrate
+          name: Run rubocop
+          command: bundle exec rubocop
 
       - run:
           name: Run ruby tests
           command: |
-              docker-compose -p isilon_tracker -f docker-compose.yaml exec --user root test_app bundle exec  rake spec
-              docker cp isilon_tracker-test_app-1:/app/coverage/lcov/app.lcov ./app.lcov
-
-      - coveralls/upload:
-          coverage_file: ./app.lcov
+            bundle exec rspec spec

.docker/app/Dockerfile

@@ -20,26 +20,26 @@ USER root
 RUN apk add -U --no-cache \
       jemalloc=5.3.0-r6 \
       bash=5.2.37-r0 \
-      busybox=1.37.0-r12 \
+      busybox=1.37.0-r18 \
       gcompat=1.1.0-r4 \
-      imagemagick=7.1.1.41-r0 \
-      libxslt=1.1.42-r2 \
+      imagemagick=7.1.1.44-r0 \
+      libxslt=1.1.43-r3 \
       postgresql16-client=16.9-r0 \
-      sqlite=3.48.0-r2 \
-      shared-mime-info=2.4-r2 \
-      ssl_client=1.37.0-r12 \
+      sqlite=3.49.2-r0 \
+      shared-mime-info=2.4-r6 \
+      ssl_client=1.37.0-r18 \
       tzdata=2025b-r0 && \
     apk add -U --no-cache --virtual build-dependencies \
       build-base=0.5-r3 \
       yaml=0.2.5-r2 \
       yaml-dev=0.2.5-r2 \
-      git=2.47.2-r0 \
-      libjpeg-turbo-dev=3.0.4-r0 \
-      libxslt-dev=1.1.42-r2 \
-      libxml2-dev=2.13.4-r6 \
+      git=2.49.0-r0 \
+      libjpeg-turbo-dev=3.1.0-r0 \
+      libxslt-dev=1.1.43-r3 \
+      libxml2-dev=2.13.8-r0 \
       postgresql16-dev=16.9-r0 \
-      sqlite-dev=3.48.0-r2 \
-      nodejs=22.13.1-r0 \
+      sqlite-dev=3.49.2-r0 \
+      nodejs=22.16.0-r2 \
       yarn=1.22.22-r1 && \
     if [ "${RAILS_ENV}" = "production" ]; then bundle config set --local without "development test"; fi && \
     bundle install --jobs=8 && \

.env

@@ -0,0 +1,2 @@
+DOCKER_IMAGE_VERSION=0.0.1
+BASE_IMAGE=ruby:3.4-alpine

.env.prod

@@ -0,0 +1,2 @@
+DOCKER_IMAGE_VERSION=0.0.1
+BASE_IMAGE=ruby:3.4-alpine

Makefile

@@ -67,4 +67,4 @@ up:
 	bundle install
 	bundle exec rake db:seed
 	bundle exec rake db:migrate
-	bundle exec rails s -p 3000
+	bundle exec rails s -d -p 3000