diff --git a/Others/tomcat/11.0.12/24.03-lts-sp2/Dockerfile b/Others/tomcat/11.0.12/24.03-lts-sp2/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..eacd7adee0dcc192e63a403a286077d4947dc204 --- /dev/null +++ b/Others/tomcat/11.0.12/24.03-lts-sp2/Dockerfile @@ -0,0 +1,36 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp2 +FROM ${BASE} +ARG VERSION=11.0.12 +ARG TARGETARCH +ARG BUILDARCH +ARG JDK_VERSION=17.0.12 + +RUN dnf update -y \ + && dnf install -y git wget ant \ + && dnf clean all \ + && rm -rf /var/cache/dnf + +RUN if [ "$TARGETARCH" = "amd64" ]; then \ + BUILDARCH="x64"; \ + elif [ "$TARGETARCH" = "arm64" ]; then \ + BUILDARCH="aarch64"; \ + fi \ + && cd / \ + && wget https://download.oracle.com/java/17/archive/jdk-${JDK_VERSION}_linux-${BUILDARCH}_bin.tar.gz \ + && tar -zxvf jdk-${JDK_VERSION}_linux-${BUILDARCH}_bin.tar.gz \ + && rm -f jdk-${JDK_VERSION}_linux-${BUILDARCH}_bin.tar.gz + +ENV JAVA_HOME=/jdk-17.0.12 +ENV PATH=/jdk-17.0.12/bin:$PATH + +WORKDIR /opt + +RUN git clone -b ${VERSION} --depth 1 https://github.com/apache/tomcat.git \ + && cd tomcat \ + && ant + +WORKDIR /opt/tomcat/output/build/bin + +EXPOSE 8080 + +CMD ["./catalina.sh", "run"] \ No newline at end of file diff --git a/Others/tomcat/README.md b/Others/tomcat/README.md index 075fc6542d7f8cfdc6017f8ca7c75437457cf1ae..e67245f19c7f53681d12e51384b2753f11296c47 100644 --- a/Others/tomcat/README.md +++ b/Others/tomcat/README.md @@ -13,6 +13,7 @@ The tag of each `tomcat` docker image is consist of the version of `tomcat` and | Tag | Currently | Architectures | |----------|-------------|------------------| +|[11.0.12-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/tomcat/11.0.12/24.03-lts-sp2/Dockerfile) | tomcat 11.0.12 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[11.0.11-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/tomcat/11.0.11/24.03-lts-sp1/Dockerfile) | tomcat 11.0.11 on openEuler 24.03-LTS-SP1 | amd64, arm64 | |[11.0.10-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/tomcat/11.0.10/24.03-lts-sp1/Dockerfile) | tomcat 11.0.10 on openEuler 24.03-LTS-SP1 | amd64, arm64 | |[9.0.10-oe2003sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/tomcat/9.0.10/20.03-lts-sp1/Dockerfile)| Tomcat 9.0.10 on openEuler 20.03-LTS-SP1 | amd64, arm64 | diff --git a/Others/tomcat/doc/image-info.yml b/Others/tomcat/doc/image-info.yml index 8731da8954f9b59bcaefe19d1f4939e751cff12a..2db4e263d30ec5a3e3be100e0a0efb330b1f5c7f 100644 --- a/Others/tomcat/doc/image-info.yml +++ b/Others/tomcat/doc/image-info.yml @@ -11,6 +11,7 @@ tags: | | Tag | Currently | Architectures | |----------|-------------|------------------| + |[11.0.12-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/tomcat/11.0.12/24.03-lts-sp2/Dockerfile) | tomcat 11.0.12 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[11.0.11-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/tomcat/11.0.11/24.03-lts-sp1/Dockerfile) | tomcat 11.0.11 on openEuler 24.03-LTS-SP1 | amd64, arm64 | |[11.0.10-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/tomcat/11.0.10/24.03-lts-sp1/Dockerfile) | tomcat 11.0.10 on openEuler 24.03-LTS-SP1 | amd64, arm64 | |[9.0.10-oe2003sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/tomcat/9.0.10/20.03-lts-sp1/Dockerfile)| Tomcat 9.0.10 on openEuler 20.03-LTS-SP1 | amd64, arm64 | diff --git a/Others/tomcat/meta.yml b/Others/tomcat/meta.yml index 17a0dec9b02ff7f932cca19437edca3407c85fa6..5f5e9807b7bd621e74194f5d74bd29be5b9caf29 100644 --- a/Others/tomcat/meta.yml +++ b/Others/tomcat/meta.yml @@ -8,4 +8,6 @@ 11.0.10-oe2403sp1: path: 11.0.10/24.03-lts-sp1/Dockerfile 11.0.11-oe2403sp1: - path: 11.0.11/24.03-lts-sp1/Dockerfile \ No newline at end of file + path: 11.0.11/24.03-lts-sp1/Dockerfile +11.0.12-oe2403sp2: + path: 11.0.12/24.03-lts-sp2/Dockerfile \ No newline at end of file