From 548db3a22fc43abac82326282c910406cd807ff9 Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Mon, 26 May 2025 17:03:19 +0800 Subject: [PATCH 1/2] web apps --- HPC/image-list.yml | 2 ++ .../lammps/29Aug2024/24.03-lts-sp1/Dockerfile | 0 {Others => HPC}/lammps/meta.yml | 0 .../nemo/6.4.5/24.03-lts-sp1/Dockerfile | 0 {Others => HPC}/nemo/meta.yml | 0 Others/image-list.yml | 1 + Others/tomcat/11.0.7/24.03-lts-sp1/Dockerfile | 36 +++++++++++++++++++ Others/tomcat/meta.yml | 4 +++ Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile | 25 +++++++++++++ Others/varnish/meta.yml | 2 ++ 10 files changed, 70 insertions(+) rename {Others => HPC}/lammps/29Aug2024/24.03-lts-sp1/Dockerfile (100%) rename {Others => HPC}/lammps/meta.yml (100%) rename {Others => HPC}/nemo/6.4.5/24.03-lts-sp1/Dockerfile (100%) rename {Others => HPC}/nemo/meta.yml (100%) create mode 100644 Others/tomcat/11.0.7/24.03-lts-sp1/Dockerfile create mode 100644 Others/tomcat/meta.yml create mode 100644 Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile create mode 100644 Others/varnish/meta.yml diff --git a/HPC/image-list.yml b/HPC/image-list.yml index 4fc6e88..9c689fc 100644 --- a/HPC/image-list.yml +++ b/HPC/image-list.yml @@ -10,3 +10,5 @@ images: yambo: yambo tensorrt: tensorrt mne: mne + nemo: nemo + lammps: lammps diff --git a/Others/lammps/29Aug2024/24.03-lts-sp1/Dockerfile b/HPC/lammps/29Aug2024/24.03-lts-sp1/Dockerfile similarity index 100% rename from Others/lammps/29Aug2024/24.03-lts-sp1/Dockerfile rename to HPC/lammps/29Aug2024/24.03-lts-sp1/Dockerfile diff --git a/Others/lammps/meta.yml b/HPC/lammps/meta.yml similarity index 100% rename from Others/lammps/meta.yml rename to HPC/lammps/meta.yml diff --git a/Others/nemo/6.4.5/24.03-lts-sp1/Dockerfile b/HPC/nemo/6.4.5/24.03-lts-sp1/Dockerfile similarity index 100% rename from Others/nemo/6.4.5/24.03-lts-sp1/Dockerfile rename to HPC/nemo/6.4.5/24.03-lts-sp1/Dockerfile diff --git a/Others/nemo/meta.yml b/HPC/nemo/meta.yml similarity index 100% rename from Others/nemo/meta.yml rename to HPC/nemo/meta.yml diff --git a/Others/image-list.yml b/Others/image-list.yml index 896fbde..c79069f 100644 --- a/Others/image-list.yml +++ b/Others/image-list.yml @@ -74,6 +74,7 @@ images: cjson: cjson musl: musl mesa: mesa + varnish: varnish nemo: nemo lammps: lammps haproxy: haproxy diff --git a/Others/tomcat/11.0.7/24.03-lts-sp1/Dockerfile b/Others/tomcat/11.0.7/24.03-lts-sp1/Dockerfile new file mode 100644 index 0000000..3a0c594 --- /dev/null +++ b/Others/tomcat/11.0.7/24.03-lts-sp1/Dockerfile @@ -0,0 +1,36 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp1 +FROM ${BASE} +ARG VERSION=11.0.7 +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 11.0.7 --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/meta.yml b/Others/tomcat/meta.yml new file mode 100644 index 0000000..8f3b1cc --- /dev/null +++ b/Others/tomcat/meta.yml @@ -0,0 +1,4 @@ +9.0.10-20.03-lts-sp1: + path: 9.0.10/20.03-lts-sp1/Dockerfile +7.7.1-oe2403sp1: + path: 7.7.1/24.03-lts-sp1/Dockerfile diff --git a/Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile b/Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile new file mode 100644 index 0000000..390432e --- /dev/null +++ b/Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile @@ -0,0 +1,25 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp1 +FROM ${BASE} +ARG VERSION=7.7.1 + +RUN dnf update -y \ + && dnf install -y wget diffutils jemalloc-devel libunwind-devel \ + python3-sphinx make autoconf automake libedit-devel libtool \ + ncurses-devel pcre2-devel pkgconfig python3-docutils cpio graphviz \ + && dnf clean all \ + && rm -rf /var/cache/dnf + +WORKDIR /opt + +RUN wget https://varnish-cache.org/downloads/varnish-${VERSION}.tgz \ + && tar -zxvf varnish-${VERSION}.tgz \ + && varnish-${VERSION}.tgz + +WORKDIR /opt/varnish-${VERSION} + +RUN ./autogen.sh \ + && ./configure \ + && make -j \ + && make install + +CMD ["varnishd", "--help"] \ No newline at end of file diff --git a/Others/varnish/meta.yml b/Others/varnish/meta.yml new file mode 100644 index 0000000..a0be90c --- /dev/null +++ b/Others/varnish/meta.yml @@ -0,0 +1,2 @@ +7.7.1-oe2403sp1: + path: 7.7.1/24.03-lts-sp1/Dockerfile -- Gitee From 09e1f358d49593c9053f23cd058222787a15c939 Mon Sep 17 00:00:00 2001 From: baigj Date: Tue, 27 May 2025 02:33:54 +0000 Subject: [PATCH 2/2] update Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile. Signed-off-by: baigj --- Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile b/Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile index 390432e..c951b10 100644 --- a/Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile +++ b/Others/varnish/7.7.1/24.03-lts-sp1/Dockerfile @@ -13,7 +13,7 @@ WORKDIR /opt RUN wget https://varnish-cache.org/downloads/varnish-${VERSION}.tgz \ && tar -zxvf varnish-${VERSION}.tgz \ - && varnish-${VERSION}.tgz + && rm -f varnish-${VERSION}.tgz WORKDIR /opt/varnish-${VERSION} -- Gitee