Fix spinning up BL instance using docker-compose up

.docker/app/Dockerfile

@@ -9,8 +9,10 @@ RUN apk add --update --no-cache \
   libxml2-dev \
   libxslt-dev \
   nodejs \
+  shared-mime-info \
   sqlite-dev \
-  tzdata
+  tzdata \
+  yarn
 
 RUN mkdir /app
 WORKDIR /app

.dockerignore

@@ -0,0 +1,3 @@
+Gemfile.lock
+.internal_test_app
+.solr_wrapper.yml

.env

@@ -1,5 +1,5 @@
-ALPINE_RUBY_VERSION=2.6.5
-RAILS_VERSION=5.2.5
+ALPINE_RUBY_VERSION=3.0.3
+RAILS_VERSION=6.0.3.4
 SOLR_PORT=8983
 SOLR_URL=http://solr:8983/solr/blacklight-core
 SOLR_VERSION=latest

docker-compose.yml

@@ -7,15 +7,18 @@ services:
       dockerfile: .docker/app/Dockerfile
       args:
         - ALPINE_RUBY_VERSION
-    volumes:
-      - .:/app
+    # mounting . is causing seg-fault on macosx
+    #volumes:
+      #- .:/app
     depends_on:
       - solr
     ports:
       - "3000:3000"
     environment:
       - SOLR_URL # Set via environment variable or use default defined in .env file
       - RAILS_VERSION # Set via environment variable or use default defined in .env file
+      - SOLR_ENV=docker-compose
+      - ENGINE_CART_RAILS_OPTIONS=--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test --skip-solr
 
   solr:
     environment:

tasks/blacklight.rake

@@ -21,7 +21,11 @@ def system_with_error_handling(*args)
 end
 
 def with_solr(&block)
-  if system('docker-compose -v')
+  # We're being invoked by the app entrypoint script and solr is already up via docker-compose
+  if ENV['SOLR_ENV'] == 'docker-compose'
+    yield
+  elsif system('docker-compose -v')
+    # We're not running docker-compose up but still want to use a docker instance of solr.
     begin
       puts "Starting Solr"
       system_with_error_handling "docker-compose up -d solr"