make script executable

OregonDigital · Aug 19, 2021 · 7ac598b · 7ac598b
1 parent 66453e0
commit 7ac598b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,8 +10,8 @@ jobs:
           - OREGONDIGITAL_FEDORA_HOST: http://localhost:8983/fedora
       - image: circleci/mongo:3
       - image: redis
-      - image: oregondigital/solr
-        command: bash -lc 'chmod 775 /docker-entrypoint-initdb.d/odsetup.sh && /docker-entrypoint-initdb.d/odsetup.sh && bin/solr start -f -p 8985'
+      - image: oregondigital/solr:20210819
+        command: bash -lc '/docker-entrypoint-initdb.d/odsetup.sh && bin/solr start -f -p 8985'
       - image: oregondigital/hydra-jetty:3.8.1-4.0
         command: bash -lc 'rm -f /opt/jetty/webapps/solr.war && java -jar start.jar'
 

diff --git a/docker/Dockerfile-solr b/docker/Dockerfile-solr
@@ -6,3 +6,6 @@ FROM solr:6-alpine
 MAINTAINER Jeremy Echols <jechols@uoregon.edu>
 COPY solr_conf/conf_v6 /var/odconf
 COPY docker/solrsetup.sh /docker-entrypoint-initdb.d/odsetup.sh
+USER root
+RUN chmod 775 /docker-entrypoint-initdb.d/odsetup.sh
+USER solr