From 6b7510bd0b508e2a80a97198b659494893b2f5a1 Mon Sep 17 00:00:00 2001 From: lelan-j Date: Fri, 24 May 2024 09:10:40 +0200 Subject: [PATCH] chore: no more md5 checksum on published tomcat version --- .github/workflows/build.yml | 7 ++++--- Dockerfile | 11 ++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b3a71a..42d51de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,13 +5,14 @@ on: push jobs: test: name: Test - Units & Integrations - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest 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' - name: Maven test run: mvn test -B diff --git a/Dockerfile b/Dockerfile index 3d9b146..1b9b26d 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,17 @@ 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 \ && 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 \ && 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 \ && 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 \