Skip to content

Commit

Permalink
Cambio version a tomcat 10, jdk 17 y maven 3.8.8
Browse files Browse the repository at this point in the history
  • Loading branch information
178Pelado committed May 2, 2024
1 parent f69d458 commit 9aafa62
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
9 changes: 7 additions & 2 deletions docker/Dockerfile.cic
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# NAME: arieljlira/dspace
FROM tomcat:9-jdk11
FROM tomcat:10-jdk17

LABEL maintainer "[email protected]"

Expand Down Expand Up @@ -28,9 +28,14 @@ ENV BOOTSTRAP_DUMP "${DSPACE_BASE}/bootstrap-dump.sql"
RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7

RUN apt-get update && apt-get -y upgrade
RUN apt-get install -y --no-install-recommends git ant maven postgresql-client
RUN apt-get install -y --no-install-recommends git ant postgresql-client
RUN apt-get install -y --no-install-recommends procps curl sudo gpg

ENV MAVEN_VERSION 3.8.8
RUN curl -fsSL https://apache.osuosl.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar xzf - -C /usr/share \
&& mv /usr/share/apache-maven-$MAVEN_VERSION /usr/share/maven \
&& ln -s /usr/share/maven/bin/mvn /usr/bin/mvn

RUN apt-get autoremove -y && apt-get clean

WORKDIR ${DSPACE_BASE}
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
dockerfile: Dockerfile.cic
command: start
environment:
CATALINA_OPTS: "-Xmx1024m -Xms512m -XX:MaxPermSize=256m"
CATALINA_OPTS: "-Xmx1024m -Xms512m"
DSPACE_WEBAPPS: "${DSPACE_WEBAPPS}" # posible values: "server oai rdf sword swordv2"
DSPACE_ROOT_WEBAPP: "${DSPACE_ROOT_WEBAPP}"
POSTGRES_DB_HOST: "dspacedb"
Expand Down

0 comments on commit 9aafa62

Please sign in to comment.