diff --git a/ats/8.0.5/22.03-lts-sp3/Dockerfile b/ats/8.0.5/22.03-lts-sp3/Dockerfile deleted file mode 100644 index 9b160fcdd347c2a1a2c888ffd19cbd4fbc189dab..0000000000000000000000000000000000000000 --- a/ats/8.0.5/22.03-lts-sp3/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -ARG BASE=openeuler/openeuler:22.03-lts-sp3 -FROM ${BASE} - -ARG TARGETARCH -ARG ATS_HOME=trafficserver-8.0.5 -ARG ATS_PACKAGE=8.0.5.tar.gz -ARG PATCH_AME=95a535b6b8bf459dfe95e3bfebc4cc8896ff42a1.patch - -RUN yum -y install autoconf automake libtool make ncurses-devel tcl-devel pcre pcre-devel initscripts wget patch diffutils python gcc gcc-c++ openssl openssl-devel && \ - mkdir /tmp/ats && cd /tmp/ats/ && wget https://github.com/apache/trafficserver/archive/${ATS_PACKAGE} --no-check-certificate && \ - tar -xvf ${ATS_PACKAGE} && cd ${ATS_HOME} && \ - if [ "$TARGETARCH" = "arm64" ]; then \ - sed -i "s/\ -mcx16//g" `find -name Makefile`; \ - wget https://github.com/apache/trafficserver/commit/${PATCH_AME}; \ - patch -p1 < ${PATCH_AME}; \ - fi && \ - autoreconf -if && ./configure --prefix=/opt/trafficServer CC=/usr/bin/gcc CXX=/usr/bin/g++ --with-ncurses && \ - if [ "$TARGETARCH" = "arm64" ]; then \ - sed -i "s/\ -mcx16//g" `find -name Makefile`; \ - fi && \ - make clean && make -j "$(nproc)" && make install && \ - rm -rf /tmp/ats - -RUN ln -s /etc/openEuler-release /etc/redhat-release - -ENV PATH=/opt/trafficServer/bin/:$PATH - -EXPOSE 8080 - -CMD ["trafficserver", "start"] \ No newline at end of file diff --git a/ats/9.2.4-rc0/22.03-lts-sp3/Dockerfile b/ats/9.2.4-rc0/22.03-lts-sp3/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..ff565d5e8f9b371d4436e07a0b3c764188dc9a09 --- /dev/null +++ b/ats/9.2.4-rc0/22.03-lts-sp3/Dockerfile @@ -0,0 +1,27 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp3 +FROM ${BASE} + +ARG VERSION=9.2.4-rc0 +ARG TARGETARCH + +RUN yum -y install autoconf automake libtool make ncurses-devel tcl-devel pcre-devel initscripts patch g++ openssl-devel && \ + curl -fSL -o trafficserver.tar.gz https://github.com/apache/trafficserver/archive/${VERSION}.tar.gz && \ + mkdir -p /tmp/trafficserver && \ + tar -xvf trafficserver.tar.gz -C /tmp/trafficserver --strip-components=1 && \ + rm -f trafficserver.tar.gz && cd /tmp/trafficserver && \ + autoreconf -if && \ + ./configure --prefix=/opt/trafficServer --with-ncurses && \ + if [ "$TARGETARCH" = "arm64" ]; then \ + sed -i "s/\ -mcx16//g" `find -name Makefile`; \ + fi && \ + make clean && make -j "$(nproc)" && make install && \ + rm -rf /tmp/trafficserver && \ + yum remove -y autoconf automake make patch && yum clean all + +RUN ln -s /etc/openEuler-release /etc/redhat-release + +ENV PATH=/opt/trafficServer/bin/:$PATH + +EXPOSE 8080 + +CMD ["trafficserver", "start"] \ No newline at end of file diff --git a/ats/README.md b/ats/README.md index 2ac17672c79a796e616bb4edd6ded249d72d1d0c..375723ee9ac6da26d0a2ee06329fd41038530fc3 100644 --- a/ats/README.md +++ b/ats/README.md @@ -24,7 +24,7 @@ docker run -ti openeuler/ats:$VERSION # Supported tags and respective Dockerfile links -- 179.0.0.93.oe2203sp3: ats 8.0.5, openEuler 22.03-lts-sp3 +- 9.2.4-rc0.oe2203sp3: ats 9.2.4-rc0, openEuler 22.03-lts-sp3 ## Operating System Linux/Unix, ARM64 or x86-64 architecture. diff --git a/ats/doc/image-info.yaml b/ats/doc/image-info.yaml index 4bae980fb7cbc155c63cd00b27bea6d53d0e248e..b6588711558754dd25678d7a925f90ce08595fdc 100644 --- a/ats/doc/image-info.yaml +++ b/ats/doc/image-info.yaml @@ -1,5 +1,5 @@ name: ATS -category: others +category: Web description: ATS(Apache Traffic Server)是一个高性能的、模块化的HTTP代理和缓存服务器。 environment: | 本应用在Docker环境中运行,安装Docker执行如下命令 @@ -11,7 +11,7 @@ tags: | | Tag | Currently | Architectures | |----------|-------------|------------------| - |[8.0.5-oe2203sp3](https://gitee.com/openeuler/openeuler-docker-images/blob/master/ats/8.0.5/22.03-lts-sp3/Dockerfile)| ATS 8.0.5 on openEuler 22.03-LTS-SP3 | amd64, arm64 | + |[9.2.4-rc0-oe2203sp3](https://gitee.com/openeuler/openeuler-docker-images/blob/master/ats/9.2.4-rc0/22.03-lts-sp3/Dockerfile)| ATS 9.2.4-rc0 on openEuler 22.03-LTS-SP3 | amd64, arm64 | download: | 拉取镜像到本地 diff --git a/ats/meta.yaml b/ats/meta.yaml index 1128f7bf290e4fbde634a02a16d5864f40832684..48cf7324003a18da9ef96d5ebd381ad504a4d4f7 100644 --- a/ats/meta.yaml +++ b/ats/meta.yaml @@ -1,2 +1,2 @@ -8.0.5-oe2203sp3: - ats/8.0.5/22.03-lts-sp3/Dcokerfile \ No newline at end of file +9.2.4-rc0-oe2203sp3: + ats/9.2.4-rc0/22.03-lts-sp3/Dcokerfile \ No newline at end of file diff --git a/loki/doc/image-info.yml b/loki/doc/image-info.yml index 959e8b0e441208be94eca6a327066f5006c550da..501ecd54d05a636d7bf2d297cfac089749e5df05 100644 --- a/loki/doc/image-info.yml +++ b/loki/doc/image-info.yml @@ -15,7 +15,7 @@ tags: | download: | 拉取镜像到本地 - ``` + `` docker pull openeuler/loki:{Tag} ```