From 9aafa6259e7364e3391891a25310113c6addb81b Mon Sep 17 00:00:00 2001 From: Felipe Mosqueira Date: Thu, 2 May 2024 11:48:15 -0300 Subject: [PATCH] Cambio version a tomcat 10, jdk 17 y maven 3.8.8 --- docker/Dockerfile.cic | 9 +++++++-- docker/docker-compose.yml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.cic b/docker/Dockerfile.cic index 51d93231d6e5..5f9f6599f7e1 100644 --- a/docker/Dockerfile.cic +++ b/docker/Dockerfile.cic @@ -1,5 +1,5 @@ # NAME: arieljlira/dspace -FROM tomcat:9-jdk11 +FROM tomcat:10-jdk17 LABEL maintainer "alira@sedici.unlp.edu.ar" @@ -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} diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 4c9b56a0e3dc..1f29964cc58b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -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"