dev-docker: only run bundle/yarn during build

.circleci/config.yml

@@ -122,9 +122,6 @@ jobs:
       VALKYRIE_SOLR_CORE: valkyrie-test
       VALKYRIE_SOLR_PORT: 8985
     steps:
-      - run:
-          name: yarn
-          command: cd /app/samvera/hyrax-engine && yarn
       - run:
           name: Create solr core
           command: |

.dassie/.env

@@ -1,4 +1,5 @@
 ANALYTICS_START_DATE=2021-08-21
+BUNDLE_GEMFILE=Gemfile.dassie
 CHROME_HEADLESS_MODE=false
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5

.dassie/Gemfile.dassie

@@ -0,0 +1,2 @@
+# Use dedicated lock files for dassie/koppie to avoid gem mismatches
+eval_gemfile 'Gemfile'

.dockerignore

@@ -16,6 +16,7 @@ chart/*
 
 Gemfile.lock
 .dassie/Gemfile.lock
+.koppie/Gemfile.lock
 
 node_modules/*
-yarn.lock
+yarn.lock

.gitignore

@@ -4,7 +4,7 @@
 ruby-version
 ruby-gemset
 .rvmrc
-Gemfile.lock
+Gemfile*.lock
 
 # don't push around data files (for dev envs only)
 fcrepo4-data

.koppie/.env

@@ -1,3 +1,4 @@
+BUNDLE_GEMFILE=Gemfile.koppie
 CHROME_HEADLESS_MODE=false
 DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DATABASE_TEST_URL=postgresql://hyrax_user:hyrax_password@postgres/hyrax_test?pool=5

.koppie/Gemfile.koppie

@@ -0,0 +1,2 @@
+# Use dedicated lock files for dassie/koppie to avoid gem mismatches
+eval_gemfile 'Gemfile'

Dockerfile

@@ -100,7 +100,9 @@ COPY --chown=1001:101 . /app/samvera/hyrax-engine
 RUN bundle -v && \
   bundle install --jobs "$(nproc)" && \
   cd $HYRAX_ENGINE_PATH && \
-  bundle install --jobs "$(nproc)"
+  bundle install --jobs "$(nproc)" && \
+  yarn
+
 RUN RAILS_ENV=production SECRET_KEY_BASE='fakesecret1234' DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
 
 

Gemfile.dassie

@@ -0,0 +1,2 @@
+# Use dedicated lock files for dassie/koppie to avoid gem mismatches
+eval_gemfile 'Gemfile'

Gemfile.koppie

@@ -0,0 +1,2 @@
+# Use dedicated lock files for dassie/koppie to avoid gem mismatches
+eval_gemfile 'Gemfile'

docker-compose-koppie.yml

@@ -8,8 +8,9 @@ services:
       args:
         - EXTRA_APK_PACKAGES=git less chromium
         - APP_PATH=.koppie
+        - BUNDLE_GEMFILE=Gemfile.koppie
     image: ghcr.io/samvera/koppie
-    command: sh -c 'bundle && yarn && bundle exec puma -v -b tcp://0.0.0.0:3000'
+    command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
     user: root
@@ -46,7 +47,7 @@ services:
       args:
         - APP_PATH=.koppie
     image: ghcr.io/samvera/koppie-worker
-    command: sh -c 'bundle && bundle exec sidekiq'
+    command: sh -c 'bundle exec sidekiq'
     user: root
     env_file:
       - .koppie/.env
@@ -78,7 +79,7 @@ services:
     user: root
     env_file:
       - .koppie/.env
-    command: sh -c 'bundle && db-migrate-seed.sh'
+    command: db-migrate-seed.sh
     depends_on:
       - postgres
     volumes:

docker-compose.yml

@@ -6,9 +6,10 @@ services:
       context: .
       target: hyrax-engine-dev
       args:
-        - EXTRA_APK_PACKAGES=git less chromium
+        - EXTRA_APK_PACKAGES=git less
+        - BUNDLE_GEMFILE=Gemfile.dassie
     image: ghcr.io/samvera/dassie
-    command: sh -c 'bundle && bundle exec puma -v -b tcp://0.0.0.0:3000'
+    command: sh -c 'bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
     user: root
@@ -42,7 +43,7 @@ services:
       context: .
       target: hyrax-engine-dev-worker
     image: ghcr.io/samvera/dassie-worker
-    command: sh -c 'bundle && bundle exec sidekiq'
+    command: sh -c 'bundle exec sidekiq'
     user: root
     env_file:
       - .dassie/.env
@@ -73,7 +74,7 @@ services:
     user: root
     env_file:
       - .dassie/.env
-    command: sh -c 'bundle && db-migrate-seed.sh'
+    command: db-migrate-seed.sh
     depends_on:
       - postgres
     volumes: