From 67d4cb5b1e0d70128a26d3b8f66c6d0d7eb8c094 Mon Sep 17 00:00:00 2001 From: lelan-j Date: Thu, 23 May 2024 10:05:35 +0200 Subject: [PATCH 1/6] chore: no more md5 checksum on published tomcat version --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a034b23..0d6febc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM java:openjdk-8-jre-alpine +FROM openjdk:8-jre-alpine MAINTAINER JLL "lelan-j@mgdis.fr" # TOMCAT @@ -6,20 +6,20 @@ MAINTAINER JLL "lelan-j@mgdis.fr" EXPOSE 8080 # Tomcat Version -ENV TOMCAT_VERSION_MAJOR 7 -ENV TOMCAT_VERSION_FULL 7.0.69 +ENV TOMCAT_VERSION_MAJOR 9 +ENV TOMCAT_VERSION_FULL 9.0.89 # Download and install RUN set -x \ && apk add --no-cache su-exec \ && apk add --update curl unzip \ && addgroup tomcat && adduser -s /bin/bash -D -G tomcat tomcat \ - && mkdir /opt \ + && mkdir -p /opt \ && curl -LO https://archive.apache.org/dist/tomcat/tomcat-${TOMCAT_VERSION_MAJOR}/v${TOMCAT_VERSION_FULL}/bin/apache-tomcat-${TOMCAT_VERSION_FULL}.tar.gz \ - && curl -LO https://archive.apache.org/dist/tomcat/tomcat-${TOMCAT_VERSION_MAJOR}/v${TOMCAT_VERSION_FULL}/bin/apache-tomcat-${TOMCAT_VERSION_FULL}.tar.gz.md5 \ - && md5sum -c apache-tomcat-${TOMCAT_VERSION_FULL}.tar.gz.md5 \ +# && curl -LO https://archive.apache.org/dist/tomcat/tomcat-${TOMCAT_VERSION_MAJOR}/v${TOMCAT_VERSION_FULL}/bin/apache-tomcat-${TOMCAT_VERSION_FULL}.tar.gz.md5 \ +# && md5sum -c apache-tomcat-${TOMCAT_VERSION_FULL}.tar.gz.md5 \ && gunzip -c apache-tomcat-${TOMCAT_VERSION_FULL}.tar.gz | tar -xf - -C /opt \ - && rm -f apache-tomcat-${TOMCAT_VERSION_FULL}.tar.gz apache-tomcat-${TOMCAT_VERSION_FULL}.tar.gz.md5 \ +# && rm -f apache-tomcat-${TOMCAT_VERSION_FULL}.tar.gz apache-tomcat-${TOMCAT_VERSION_FULL}.tar.gz.md5 \ && ln -s /opt/apache-tomcat-${TOMCAT_VERSION_FULL} /opt/tomcat \ && rm -rf /opt/tomcat/webapps/examples /opt/tomcat/webapps/docs /opt/tomcat/webapps/manager /opt/tomcat/webapps/host-manager \ && apk del curl \ From 5061961cf77efcee025aeeb448a4377c68653ce2 Mon Sep 17 00:00:00 2001 From: Johan LE LAN <168720704+johanlelan-mgdis@users.noreply.github.com> Date: Thu, 23 May 2024 17:11:21 +0200 Subject: [PATCH 2/6] chore: Update build.yml --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b3a71a..070963f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,10 +8,13 @@ jobs: runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up JDK 8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 8 + distribution: 'temurin' + architecture: x64 + cache: maven - name: Maven test run: mvn test -B From e3ebddcff8be60517ed234f02d4e8c4db10d1567 Mon Sep 17 00:00:00 2001 From: Johan LE LAN <168720704+johanlelan-mgdis@users.noreply.github.com> Date: Thu, 23 May 2024 17:12:36 +0200 Subject: [PATCH 3/6] chore: use ubuntu-latest --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 070963f..966f51a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: push jobs: test: name: Test - Units & Integrations - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 7fbed141ee443048127b20983f56db38229799ca Mon Sep 17 00:00:00 2001 From: Johan LE LAN <168720704+johanlelan-mgdis@users.noreply.github.com> Date: Thu, 23 May 2024 17:17:19 +0200 Subject: [PATCH 4/6] chore: remove arch and temurin requirements --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 966f51a..7126eb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,8 +13,6 @@ jobs: uses: actions/setup-java@v4 with: java-version: 8 - distribution: 'temurin' - architecture: x64 cache: maven - name: Maven test run: mvn test -B From edec8c2ffb20e26958e9fd9c7f7c9690a0fb8585 Mon Sep 17 00:00:00 2001 From: Johan LE LAN <168720704+johanlelan-mgdis@users.noreply.github.com> Date: Thu, 23 May 2024 17:19:39 +0200 Subject: [PATCH 5/6] chore: add temurin distribution --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7126eb3..c1beaf8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: 8 + distribution: 'temurin' cache: maven - name: Maven test run: mvn test -B From 23ee45e0dd120ca9463bb62d6b82ac4645f43bdd Mon Sep 17 00:00:00 2001 From: lelan-j Date: Thu, 23 May 2024 17:32:38 +0200 Subject: [PATCH 6/6] fix: replace /data persistence path by /tmp --- src/main/webapp/WEB-INF/classes/default.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/classes/default.properties b/src/main/webapp/WEB-INF/classes/default.properties index 1818f01..cb298a1 100644 --- a/src/main/webapp/WEB-INF/classes/default.properties +++ b/src/main/webapp/WEB-INF/classes/default.properties @@ -12,11 +12,11 @@ InMemoryServer.RepositoryThinClientUri="http://localhost:8080/lightweightcmis/br InMemoryServer.User=test InMemoryServer.Password=test # InMemoryServer.TypesCreatorClass=org.apache.chemistry.opencmis.inmemory.types.DefaultTypeSystemCreator -InMemoryServer.TypeDefinitionsFile=/data/cmis/default-types.xml +InMemoryServer.TypeDefinitionsFile=/tmp/cmis/default-types.xml InMemoryServer.Class=org.apache.chemistry.opencmis.inmemory.storedobj.impl.StoreManagerImpl # InMemoryServer.MemoryThreshold=10485760 -persistenceDirectory=/data/cmis/default +persistenceDirectory=/tmp/cmis/default #InMemoryServer.MaxSize=20971520 #InMemoryServer.EncryptTempFiles=false