i112-update-deploy-script

.github/workflows/build-solr.yaml

@@ -3,16 +3,18 @@ run-name: Build Solr of ${{ github.ref_name }} by @${{ github.actor }}
 on:
   workflow_dispatch:
     inputs:
-      debug_enabled:
-        type: boolean
-        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
+      debug_step:
         required: false
-        default: false
+        description: 'Pause the selected step to debug using tmate'
+        type: choice
+        default: 'build'
+        options:
+          - build
 
 jobs:
   build:
-    uses: notch8/actions/.github/workflows/build.yaml@v1.0.4
+    uses: notch8/actions/.github/workflows/build.yaml@v1.0.8
     secrets: inherit
     with:
       platforms: "linux/amd64"
-      solrTarget: hyku-solr
+      solrTarget: hyku-solr

.github/workflows/build-test-lint.yaml

@@ -22,23 +22,22 @@ on:
 
 jobs:
   build:
-    uses: notch8/actions/.github/workflows/build.yaml@v1.0.4
+    uses: notch8/actions/.github/workflows/build.yaml@v1.0.8
     secrets: inherit
     with:
-      platforms: "linux/amd64"
       webTarget: hyku-web
       workerTarget: hyku-worker
 
   test:
     needs: build
-    uses: notch8/actions/.github/workflows/test.yaml@v1.0.4
+    uses: notch8/actions/.github/workflows/test.yaml@v1.0.8
     with:
       confdir: '/app/samvera/hyrax-webapp/solr/conf'
       rspec_cmd: "cd .. && gem install semaphore_test_boosters && bundle && rspec_booster --job $CI_NODE_INDEX/$CI_NODE_TOTAL"
 
   lint:
     needs: build
-    uses: notch8/actions/.github/workflows/lint.yaml@v1.0.4
+    uses: notch8/actions/.github/workflows/lint.yaml@v1.0.8
     with:
       webTarget: hyku-web
       workerTarget: hyku-worker

.github/workflows/deploy.yaml

@@ -10,13 +10,13 @@ on:
         type: choice
         options:
           - friends
-      debug_enabled:
+      debug_step:
         type: boolean
         description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
         required: false
         default: false
 
 jobs:
   deploy:
-    uses: notch8/actions/.github/workflows/deploy.yaml@v1.0.4
+    uses: notch8/actions/.github/workflows/deploy.yaml@v1.0.8
     secrets: inherit

bin/deploy-hykudev.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+## Instructions:
+## 0. Alias was already created and persisted at ~/.bashrc:
+##    alias dc='dotenv -e .env.development docker-compose'
+## 1. Connect to WVU VPN via The Windows App
+## 2. Connect via PuTTY to hykudev server: hykudev.lib.wvu.edu with your user name
+## 3. Switch to ansible: sudo su - ansible
+## 4. cd wvu_knapsack
+## 5. git pull origin main (or branch name)
+## 6. ./bin/deploy_hykudev.sh
+
+echo "Updating submodules..."
+git submodule sync --recursive
+git submodule update --init --recursive
+
+echo "Stopping and cleaning up old containers..."
+docker compose down --remove-orphans
+
+echo "Pulling Docker images..."
+TAG="$(git rev-parse --short=8 HEAD)" dotenv -e .env.development docker compose pull
+
+echo "Building and starting containers..."
+TAG="$(git rev-parse --short=8 HEAD)" dotenv -e .env.development docker compose up -d web
+
+echo "Deploy complete. Containers are now running image tagged"
+echo ""
+echo "Admin Tenant:   https://hykudev-admin.lib.wvu.edu"
+echo "Default Tenant: https://hykudev.lib.wvu.edu"

docker-compose.yml

@@ -79,6 +79,8 @@ services:
     extends:
       file: hyrax-webapp/docker-compose.yml
       service: web
+    ports:
+      - "127.0.0.1:3000:3000"
     # Uncomment command to access container with out starting bin/web. Useful for debugging or updating Gemfile.lock
     # command: sleep infinity
 

lib/blacklight_advanced_search/render_constraints_override_decorator.rb

@@ -11,4 +11,14 @@ def render_constraints_filters(params_or_search_state = search_state)
   end
 end
 
-BlacklightAdvancedSearch::RenderConstraintsOverride.prepend(BlacklightAdvancedSearch::RenderConstraintsOverrideDecorator)
+if defined?(BlacklightAdvancedSearch::RenderConstraintsOverride)
+  # blacklight_advanced_search <= 7 (old hook point)
+  BlacklightAdvancedSearch::RenderConstraintsOverride.prepend(
+    BlacklightAdvancedSearch::RenderConstraintsOverrideDecorator
+  )
+elsif defined?(Blacklight::RenderConstraintsHelperBehavior)
+  # blacklight_advanced_search 8+ (RenderConstraintsOverride removed/renamed)
+  Blacklight::RenderConstraintsHelperBehavior.prepend(
+    BlacklightAdvancedSearch::RenderConstraintsOverrideDecorator
+  )
+end