Merge branch 'main' of https://github.com/samvera/hyku

samvera · Sep 19, 2023 · e60efac · e60efac
2 parents 3fb1254 + d6ef043
commit e60efac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml
@@ -21,8 +21,6 @@ jobs:
     secrets: inherit
     with:
       platforms: "linux/amd64" # "linux/amd64,linux/arm64"
-      target: hyku-web
-      solr: true
-      solrTarget:
-      worker: true
+      webTarget: hyku-web
+      solrTarget: hyku-solr
       workerTarget: hyku-worker
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -58,6 +58,7 @@ services:
     build:
       context: solr
       dockerfile: Dockerfile
+      target: hyku-solr
     environment:
       - OOM=script
       - SOLR_ADMIN_USER=solr

diff --git a/solr/Dockerfile b/solr/Dockerfile
@@ -1,6 +1,6 @@
-FROM solr:8.3
+FROM solr:8.3 as hyku-solr
 ENV SOLR_USER="solr" \
     SOLR_GROUP="solr"
 USER root
 COPY --chown=solr:solr security.json /var/solr/data/security.json
-USER $SOLR_USER
+USER $SOLR_USER