Merge pull request #1017 from scientist-softserv/fix-build-issue

fix-build-issue
notch8 · Apr 24, 2024 · c2d91e3 · c2d91e3
2 parents 4060ca5 + 861a64c
commit c2d91e3
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/.env b/.env
@@ -30,7 +30,6 @@ SOLR_COLLECTION_NAME=hydra-development
 SOLR_CONFIGSET_NAME=hyku-1
 SOLR_HOST=solr
 SOLR_PORT=8983
-SOLR_TAG=latest
 SOLR_URL=http://solr:SolrRocks@solr:8983/solr/
 
 # Comment out these 5 for single tenancy / Uncomment for multi

diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml
@@ -17,21 +17,19 @@ on:
 
 jobs:
   build:
-    uses: scientist-softserv/actions/.github/workflows/[email protected].14
+    uses: scientist-softserv/actions/.github/workflows/[email protected].21
     secrets: inherit
     with:
       platforms: "linux/amd64"
       webTarget: hyku-base
+      solrTarget: hyku-solr
       workerTarget: hyku-worker
   test:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/[email protected]
-    with:
-      webTarget: hyku-base
-      workerTarget: hyku-worker
+    uses: scientist-softserv/actions/.github/workflows/[email protected]
   lint:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/[email protected].14
+    uses: scientist-softserv/actions/.github/workflows/[email protected].21
     with:
-      webTarget: hyku-base
-      workerTarget: hyku-worker
+      rubocop_cmd: 'bundle exec rubocop --parallel --format progress'
+
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -5,7 +5,7 @@ on:
     inputs:
       environment:
         description: 'Deploy to Environment'
-        require: true
+        required: true
         default: 'staging'
         type: choice
         options:
@@ -20,5 +20,5 @@ on:
 
 jobs:
   deploy:
-    uses: scientist-softserv/actions/.github/workflows/[email protected].15
+    uses: scientist-softserv/actions/.github/workflows/[email protected].21
     secrets: inherit
diff --git a/Gemfile b/Gemfile
@@ -17,7 +17,7 @@ gem 'blacklight_oai_provider', '~> 6.1', '>= 6.1.1'
 gem 'blacklight_range_limit'
 gem 'bolognese', '>= 1.9.10'
 gem 'bootstrap-datepicker-rails'
-gem 'bulkrax', '~> 5.0', github: 'samvera-labs/bulkrax', branch: 'main'
+gem 'bulkrax', git: 'https://github.com/samvera-labs/bulkrax.git', tag: 'v5.3.0'
 gem 'byebug', group: %i[development test]
 gem 'capybara', group: %i[test]
 gem 'capybara-screenshot', '~> 1.0', group: %i[test]

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -20,8 +20,8 @@ GIT
 
 GIT
   remote: https://github.com/samvera-labs/bulkrax.git
-  revision: 2e4c9b79c37451fc2d147c0ae12cc4c10ceefa3c
-  branch: main
+  revision: f2439755f501caabedf4cc50618d1804e5b2293a
+  tag: v5.3.0
   specs:
     bulkrax (5.3.0)
       bagit (~> 0.4)
@@ -1424,7 +1424,7 @@ DEPENDENCIES
   blacklight_range_limit
   bolognese (>= 1.9.10)
   bootstrap-datepicker-rails
-  bulkrax (~> 5.0)!
+  bulkrax!
   byebug
   capybara
   capybara-screenshot (~> 1.0)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -34,7 +34,8 @@ class ApplicationController < ActionController::Base
 
   # rubocop:disable Metrics/AbcSize
   def global_request_logging
-    rl = ActiveSupport::Logger.new('log/request.log')
+    FileUtils.mkdir_p(Rails.root.join('log')) unless Dir.exist?(Rails.root.join('log'))
+    rl = ActiveSupport::Logger.new(Rails.root.join('log', 'request.log'))
     if request.host&.match('blc.hykucommons')
       http_request_header_keys = request.headers.env.keys.select { |header_name| header_name.match("^HTTP.*|^X-User.*") }
       http_request_headers = request.headers.env.select { |header_name, _header_value| http_request_header_keys.index(header_name) }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,8 +29,8 @@ x-app-worker: &app-worker
       - EXTRA_APK_PACKAGES=less vim bash openjdk11-jre ffmpeg rsync exiftool
       - HYKU_BULKRAX_ENABLED=true
     cache_from:
-      - ghcr.io/scientist-softserv/palni-palci:${TAG:-latest}
-      - ghcr.io/scientist-softserv/palni-palci/worker:${TAG:-latest}
+      - ghcr.io/scientist-softserv/palni-palci:latest
+      - ghcr.io/scientist-softserv/palni-palci/worker:latest
   image: ghcr.io/scientist-softserv/palni-palci/worker:${TAG:-latest}
   command: sh -l -c 'bundle && bundle exec sidekiq'
   depends_on:
@@ -85,10 +85,11 @@ services:
       timeout: "8s"
 
   solr:
-    image: ghcr.io/samvera/hyku/solr:${SOLR_TAG:-latest}
+    image: ghcr.io/scientist-softserv/palni-palci/solr:${TAG:-latest}
     build:
       context: solr
       dockerfile: Dockerfile
+      target: hyku-solr
     environment:
       - OOM=script
       - SOLR_ADMIN_USER=solr

diff --git a/solr/Dockerfile b/solr/Dockerfile
@@ -1,4 +1,4 @@
-FROM solr:8.3
+FROM solr:8.3 as hyku-solr
 ENV SOLR_USER="solr" \
     SOLR_GROUP="solr"
 USER root