Merge pull request #232 from tulibraries/fix-m1-not-working

Fix make test not working in local m1 instance.
tulibraries · Dec 10, 2024 · fce138f · fce138f
2 parents e414315 + 47c79bd
commit fce138f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,15 @@
+export
+
 DOCKER := docker compose
 
+RUBY_VERSION := 3.3.0
+
+ifeq ($(CI), true)
+	APP_IMAGE := cimg/ruby:$(RUBY_VERSION)
+else
+	APP_IMAGE := ruby:$(RUBY_VERSION)
+endif
+
 up:
 	$(DOCKER) up -d
 	$(DOCKER) exec app bundle install

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   app:
-    image: cimg/ruby:3.3.0
+    image: ${APP_IMAGE}
     working_dir: /app
     depends_on:
       - solr