Skip to content

Commit 53cdf4e

Browse files
committed
Tighten up for local dev
1 parent 7a61962 commit 53cdf4e

File tree

2,463 files changed

+7
-290756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,463 files changed

+7
-290756
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

.github/workflows/build-image.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ jobs:
1010
uses: unb-libraries/dockworker-baseimage/.github/workflows/build-base-image.yaml@6.x
1111
with:
1212
image-name: ghcr.io/unb-libraries/solr-drupal
13-
protected-tags: '8.x*,7.x*'
1413
secrets:
1514
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
1615
GH_CONTAINER_REGISTRY_TOKEN: ${{ secrets.GH_CONTAINER_REGISTRY_TOKEN }}

vendor/consolidation/self-update/.gitignore renamed to .gitignore

File renamed without changes.

Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ ARG BUILD_DATE
44
ARG VCS_REF
55
ARG VERSION
66

7-
ENV SOLR_HOME=/solr_home
7+
ENV SOLR_MODULES="extraction,langid,ltr,analysis-extras"
88

99
ADD data /solr-conf
10-
VOLUME /solr_home
1110
COPY scripts /scripts
11+
VOLUME /var/solr
12+
13+
USER solr
14+
RUN mkdir /var/solr/data
1215

1316
LABEL ca.unb.lib.generator="solr" \
1417
com.microscaling.docker.dockerfile="/Dockerfile" \

scripts/docker-entrypoint-multiple.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22
#
33
# docker-entrypoint for docker-solr
4-
54
set -e
65

76
for core in "$@"
@@ -14,4 +13,4 @@ do
1413
done
1514

1615
echo "Starting Solr..."
17-
docker-entrypoint.sh solr-foreground
16+
exec docker-entrypoint.sh solr-foreground

vendor/autoload.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

vendor/bin/dockworker

Lines changed: 0 additions & 119 deletions
This file was deleted.

vendor/bin/release

Lines changed: 0 additions & 119 deletions
This file was deleted.

0 commit comments

Comments
 (0)