Skip to content

Commit

Permalink
Updated docker file
Browse files Browse the repository at this point in the history
  • Loading branch information
sean-e-dietrich committed Apr 30, 2024
1 parent 56bd6d9 commit a23e04e
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,18 @@ RUN set -xe; \
RUN set -xe; \
ln -s /opt/solr/dist /opt/dist; \
ln -s /opt/solr/contrib /opt/contrib; \
# Needed for 9.x and above
[ -f "/opt/solr/docker/scripts/docker-entrypoint.sh" ] && sed -i '/exec "$@"/i . docksal-preinit' /opt/solr/docker/scripts/docker-entrypoint.sh; \
[ -d "/opt/solr/docker/scripts" ] && mv /scripts/healthcheck.sh /scripts/docksal-preinit /opt/solr/docker/scripts/; \
# Needed for 8.x and below
[ -f "/opt/docker-solr/scripts/docker-entrypoint.sh" ] && sed -i '/exec "$@"/i . docksal-preinit' /opt/docker-solr/scripts/docker-entrypoint.sh; \
[ -d "/opt/docker-solr/scripts/docker" ] && mv /scripts/healthcheck.sh /scripts/docksal-preinit /opt/docker-solr/scripts/; \
chown -R solr:solr /opt/docker-solr /opt/solr/server/solr
if [[ "$VERSION" =~ "9" ]]; then \
# Needed for 9.x and above
sed -i '/exec "$@"/i . docksal-preinit' /opt/solr/docker/scripts/docker-entrypoint.sh; \
mv /scripts/healthcheck.sh /scripts/docksal-preinit /opt/solr/docker/scripts/; \
chown -R solr:solr /opt/solr/docker /opt/solr/server/solr; \
fi; \
if [[ "$VERSION" =~ "8" ]]; then \
# Needed for 8.x and below
sed -i '/exec "$@"/i . docksal-preinit' /opt/docker-solr/scripts/docker-entrypoint.sh; \
mv /scripts/healthcheck.sh /scripts/docksal-preinit /opt/docker-solr/scripts/; \
chown -R solr:solr /opt/docker-solr /opt/solr/server/solr; \
fi

USER solr

Expand Down

0 comments on commit a23e04e

Please sign in to comment.