Skip to content

Commit 56bf7b6

Browse files
committed
Added docker support
1 parent 133640e commit 56bf7b6

File tree

23 files changed

+326
-145
lines changed

23 files changed

+326
-145
lines changed

.env

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
NAME=dea
2+
3+
DB_PORT=8293
4+
DB_USER=pguser
5+
DB_PASSWORD=changeme123
6+
DB_DATA=./docker/postgres-data/
7+
8+
APP_CONTEXT=dea
9+
APP_HTTP=8291
10+
APP_AJP=8292
11+
APP_DEBUG=8295
12+
APP_HOME=./docker/dea-home/
13+
APP_DATA=./docker/dea-data/
14+
APP_LOGS=./docker/dea-logs/
15+
APP_TMP=./docker/dea-tmp/
16+
17+
APP_XMS=1024m
18+
APP_XMX=1024m
19+
20+
SOLR_HTTP=8290
21+
SOLR_DATA=./docker/solr-data/

Dockerfile

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
FROM tomcat:10-jdk17-temurin-jammy
2+
RUN groupadd -r mcr -g 501 && \
3+
useradd -d /home/mcr -u 501 -m -s /bin/bash -g mcr mcr
4+
WORKDIR /usr/local/tomcat/
5+
ARG PACKET_SIZE="65536"
6+
ENV APP_CONTEXT="dea" \
7+
MCR_CONFIG_DIR="/mcr/home/" \
8+
MCR_DATA_DIR="/mcr/data/" \
9+
MCR_LOG_DIR="/mcr/logs/" \
10+
SOLR_CORE="dea" \
11+
SOLR_CLASSIFICATION_CORE="dea-classifications" \
12+
XMX="1g" \
13+
XMS="1g"
14+
#COPY --from=regreb/bibutils --chown=mcr:mcr /usr/local/bin/* /usr/local/bin/
15+
COPY --chown=root:root docker-entrypoint.sh /usr/local/bin/dea.sh
16+
17+
RUN set -eux; \
18+
chmod 555 /usr/local/bin/dea.sh; \
19+
apt-get update; \
20+
apt-get install -y gosu; \
21+
rm -rf /var/lib/apt/lists/*;
22+
RUN rm -rf /usr/local/tomcat/webapps/* && \
23+
mkdir /opt/dea/ && \
24+
chown mcr:mcr -R /opt/dea/ && \
25+
sed -ri "s/<\/Service>/<Connector protocol=\"AJP\/1.3\" packetSize=\"$PACKET_SIZE\" tomcatAuthentication=\"false\" scheme=\"https\" secretRequired=\"false\" allowedRequestAttributesPattern=\".*\" encodedSolidusHandling=\"decode\" address=\"0.0.0.0\" port=\"8009\" redirectPort=\"8443\" \/>&/g" /usr/local/tomcat/conf/server.xml
26+
COPY --chown=mcr:mcr digital-edition-archive-webapp/target/digital-edition-archive-*.war /opt/dea/dea.war
27+
COPY --chown=mcr:mcr digital-edition-archive-cli/target/digital-edition-archive-cli-*.tar.gz /opt/dea/dea.tar.gz
28+
COPY --chown=mcr:mcr docker-log4j2.xml /opt/dea/log4j2.xml
29+
RUN cd /opt/dea/ && \
30+
tar -zxf /opt/dea/dea.tar.gz && \
31+
/bin/sh -c "mv digital-edition-archive-* dea" && \
32+
chown mcr:mcr -R /opt/dea/ /usr/local/tomcat/webapps/
33+
CMD ["bash", "/usr/local/bin/dea.sh"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ MCR.Solr.Core.classification.ServerURL=%MCR.Solr.ServerURL%
5151

5252
### Initialize the application
5353
* change into CLI directory (see above)
54-
* load default data by running: `bin/digital-edition-archive.sh process config/setup-commands.txt`
54+
* load default data by running: `bin/digital-edition-archive.sh process resource setup-commands.txt`
5555

5656
### Run web server
5757
* Change to `digital-edition-archive-webapp` directory

digital-edition-archive-cli/src/main/config/acl/defaultrules-commands.txt

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

digital-edition-archive-cli/src/main/config/acl/grant-admin.xml

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

digital-edition-archive-cli/src/main/config/acl/grant-all.xml

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

digital-edition-archive-cli/src/main/config/acl/grant-editors.xml

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

digital-edition-archive-cli/src/main/config/acl/grant-guest-and-submitter.xml

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

digital-edition-archive-cli/src/main/config/acl/grant-never.xml

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

digital-edition-archive-cli/src/main/config/acl/grant-submitter.xml

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

0 commit comments

Comments
 (0)