label solr

samvera · Sep 19, 2023 · d6ef043 · d6ef043
1 parent 83b79fc
commit d6ef043
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml
@@ -22,7 +22,5 @@ jobs:
     with:
       platforms: "linux/amd64" # "linux/amd64,linux/arm64"
       webTarget: hyku-web
-      solr: true
-      solrTarget:
-      worker: true
+      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