From 58044f0e01a05be29cbf118360e147b7514e4b1e Mon Sep 17 00:00:00 2001
From: Martin Simpson <martin.simpson@ubiquitypress.com>
Date: Sun, 31 Dec 2023 15:10:02 +0700
Subject: [PATCH] changes required for new gems

---
 Gemfile                   | 17 ++++++++++-------
 docker-compose.bundle.yml |  2 --
 docker-compose.yml        |  3 ++-
 hyku_knapsack.gemspec     |  8 +++++---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 67d3d45..9cbebe2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,10 +8,13 @@ gemspec
 # gem "debug", ">= 1.0.0"
 
 # This is needed to use our local knapsack
-gemfile_path = File.expand_path("hyrax-webapp/Gemfile", __dir__)
-if File.exist?(gemfile_path)
-  gemfile = File.read(gemfile_path).split("\n").reject { |l| l.match('knapsack') }
-  # rubocop:disable Security/Eval
-  eval(gemfile.join("\n"), binding)
-  # rubocop:enable Security/Eval
-end
+#gemfile_path = File.expand_path("hyrax-webapp/Gemfile", __dir__)
+#if File.exist?(gemfile_path)
+#  gemfile = File.read(gemfile_path).split("\n").reject { |l| l.match('knapsack') }
+#  # rubocop:disable Security/Eval
+#  eval(gemfile.join("\n"), binding)
+#  # rubocop:enable Security/Eval
+#end
+
+gem 'hyku-api', path: '/app/hyku-api'
+
diff --git a/docker-compose.bundle.yml b/docker-compose.bundle.yml
index 6260bdc..3b3e585 100644
--- a/docker-compose.bundle.yml
+++ b/docker-compose.bundle.yml
@@ -4,8 +4,6 @@ version: '3.8'
 services:
   # Uncomment to allow for the use of a ruby debugger (byebug, pry, etc) in Docker.
   # See http://playbook-staging.notch8.com/en/devops/docker_debugger for more info.
-  base:
-    command: sh -l -c "bundle && bundle exec puma -v -b tcp://0.0.0.0:3000"
   web:
     command: sh -l -c "bundle && bundle exec puma -v -b tcp://0.0.0.0:3000"
   worker:
diff --git a/docker-compose.yml b/docker-compose.yml
index 2f555d7..6d39622 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,6 +50,7 @@ services:
       file: hyrax-webapp/docker-compose-ext-solr.yml
       service: base
     image: ghcr.io/samvera/hyku/base:${TAG:-latest}
+    command: bash -l -c "echo 'container not needed, exiting'"
 
   web:
     <<: *app
@@ -91,7 +92,7 @@ services:
       service: initialize_app
     command:
       - >
-        db-migrate-seed.sh
+        bundle && db-migrate-seed.sh
 
   redis:
     extends:
diff --git a/hyku_knapsack.gemspec b/hyku_knapsack.gemspec
index a70149d..dc1b142 100644
--- a/hyku_knapsack.gemspec
+++ b/hyku_knapsack.gemspec
@@ -23,8 +23,10 @@ Gem::Specification.new do |spec|
   end
 
   spec.add_dependency "rails", ">= 5.2.0"
-  spec.add_dependency "hyku-api", github: "ubiquitypress/hyku-api", branch: "main"
-  spec.add_dependency "hyku_plugin_google_cloud_url_mask", github: "ubiquitypress/hyku_plugin_google_cloud_url_mask", branch: "main", require: false
-  spec.add_dependency "hyku-plugin-schema-yaml", github: "ubiquitypress/hyku-plugin-schema-yaml", branch: "develop"
+
+  spec.add_dependency "hyku-api"
+  spec.add_dependency "hyku_plugin_google_cloud_url_mask"
+  spec.add_dependency "hyku-plugin-schema-yaml"
+
   spec.add_dependency "blacklight_advanced_search"
 end