CI fixes

docker-compose.yml

@@ -68,12 +68,12 @@ services:
       timeout: 5s
       retries: 5
   solr:
-    image: ghcr.io/gwu-libraries/scholarspace-hyrax-solr:master
+    # For prod deployments, use tagged image for release
     #image: ghcr.io/gwu-libraries/scholarspace-hyrax-solr:2.0.1
     env_file: .env
-    #build: 
-    # context: .
-    # dockerfile: Dockerfile-solr
+    build: 
+     context: .
+     dockerfile: Dockerfile-solr
     hostname: solr-hyrax
     environment:
       - SOLR_CORE=$SOLR_CORE
@@ -104,7 +104,7 @@ services:
       test: ["CMD", "redis-cli","ping"]
   sidekiq:
     env_file: .env
-    #image: ghcr.io/gwu-libraries/scholarspace-app:master
+    # For prod deployments, use tagged image for release
     # image: ghcr.io/gwu-libraries/scholarspace-app:2.0.1
     image: scholarspace-app
     build: 
@@ -117,7 +117,8 @@ services:
      - ${NGINX_KEY_DIR}:/opt/scholarspace/keys
      - /opt/scholarspace/scholarspace-derivatives:/opt/scholarspace/scholarspace-derivatives
      - app-hyrax:/opt/scholarspace
-     - /opt/scholarspace/scholarspace-hyrax:/opt/scholarspace/scholarspace-hyrax
+     # Uncomment for development
+     # - /opt/scholarspace/scholarspace-hyrax:/opt/scholarspace/scholarspace-hyrax
     networks:
       - hyrax
       - fedora
@@ -127,7 +128,7 @@ services:
     command: ["bash", "-l", "docker/scripts/scholarspace-setup.sh", "sidekiq"]
   app-server:
     env_file: .env
-    #image: ghcr.io/gwu-libraries/scholarspace-app:master
+    # For prod deployments, use tagged image for release
     # image: ghcr.io/gwu-libraries/scholarspace-app:2.0.1
     image: scholarspace-app
     depends_on:
@@ -149,7 +150,8 @@ services:
      - ${NGINX_KEY_DIR}:/opt/scholarspace/keys
      - /opt/scholarspace/scholarspace-derivatives:/opt/scholarspace/scholarspace-derivatives
      - app-hyrax:/opt/scholarspace
-     - /opt/scholarspace/scholarspace-hyrax:/opt/scholarspace/scholarspace-hyrax
+     # Uncomment for development
+     # - /opt/scholarspace/scholarspace-hyrax:/opt/scholarspace/scholarspace-hyrax
     restart: always
     logging: 
       <<: *logging

docker/ci.env

@@ -50,4 +50,11 @@ DEV_CONTENT_ADMIN_USER_EMAIL='[email protected]'
 DEV_CONTENT_ADMIN_USER_PASSWORD='password'
 HYRAX_ANALYTICS_PROVIDER=ga4
 HYRAX_ANALYTICS=true
-GOOGLE_ANALYTICS_ID=
+GOOGLE_ANALYTICS_ID=
+IDP_CERT_PEM=
+IDP_SSO_URL=https://www.example.com
+IDP_SLO_URL=https://www.example.com
+ISSUER=
+SP_KEY=
+SP_CERT=
+UID_ATTRIBUTE=