From 83e2926c595af0a676faf74ed0fcdbf06980893e Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Tue, 14 May 2024 15:24:41 +0800 Subject: [PATCH 1/5] submit docker image: ATS(Apache Traffic Server) --- loki/doc/image-info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loki/doc/image-info.yml b/loki/doc/image-info.yml index 959e8b0e..501ecd54 100644 --- a/loki/doc/image-info.yml +++ b/loki/doc/image-info.yml @@ -15,7 +15,7 @@ tags: | download: | 拉取镜像到本地 - ``` + `` docker pull openeuler/loki:{Tag} ``` -- Gitee From de597b3e3e1b2f0051fbfca513353a6c9b793128 Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Tue, 14 May 2024 16:36:41 +0800 Subject: [PATCH 2/5] review: make dockerfile simpler --- ats/8.0.5/22.03-lts-sp3/Dockerfile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/ats/8.0.5/22.03-lts-sp3/Dockerfile b/ats/8.0.5/22.03-lts-sp3/Dockerfile index 9b160fcd..c8d231bc 100644 --- a/ats/8.0.5/22.03-lts-sp3/Dockerfile +++ b/ats/8.0.5/22.03-lts-sp3/Dockerfile @@ -1,25 +1,26 @@ ARG BASE=openeuler/openeuler:22.03-lts-sp3 FROM ${BASE} +ARG VERSION=8.0.5 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}; \ +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 && \ + if [ "$TARGETARCH" = "arm64" ]; then \ + curl -fSL -o trafficserver.patch https://github.com/apache/trafficserver/commit/95a535b6b8bf459dfe95e3bfebc4cc8896ff42a1.patch; \ + patch -p1 < trafficserver.patch; \ fi && \ - autoreconf -if && ./configure --prefix=/opt/trafficServer CC=/usr/bin/gcc CXX=/usr/bin/g++ --with-ncurses && \ + 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/ats + 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 -- Gitee From db9ee759a3596a22c0bfac4999faca2d730d3d11 Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Tue, 14 May 2024 19:28:41 +0800 Subject: [PATCH 3/5] review: upgrade the app version --- ats/8.0.5/22.03-lts-sp3/Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ats/8.0.5/22.03-lts-sp3/Dockerfile b/ats/8.0.5/22.03-lts-sp3/Dockerfile index c8d231bc..ff565d5e 100644 --- a/ats/8.0.5/22.03-lts-sp3/Dockerfile +++ b/ats/8.0.5/22.03-lts-sp3/Dockerfile @@ -1,7 +1,7 @@ ARG BASE=openeuler/openeuler:22.03-lts-sp3 FROM ${BASE} -ARG VERSION=8.0.5 +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 && \ @@ -9,14 +9,10 @@ RUN yum -y install autoconf automake libtool make ncurses-devel tcl-devel pcre-d mkdir -p /tmp/trafficserver && \ tar -xvf trafficserver.tar.gz -C /tmp/trafficserver --strip-components=1 && \ rm -f trafficserver.tar.gz && cd /tmp/trafficserver && \ - if [ "$TARGETARCH" = "arm64" ]; then \ - curl -fSL -o trafficserver.patch https://github.com/apache/trafficserver/commit/95a535b6b8bf459dfe95e3bfebc4cc8896ff42a1.patch; \ - patch -p1 < trafficserver.patch; \ - fi && \ autoreconf -if && \ ./configure --prefix=/opt/trafficServer --with-ncurses && \ if [ "$TARGETARCH" = "arm64" ]; then \ - sed -i "s/\ -mcx16//g" `find -name Makefile`; \ + sed -i "s/\ -mcx16//g" `find -name Makefile`; \ fi && \ make clean && make -j "$(nproc)" && make install && \ rm -rf /tmp/trafficserver && \ -- Gitee From 064dfe8c337f220dd25321f26a64551850eb4adc Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Tue, 14 May 2024 19:33:06 +0800 Subject: [PATCH 4/5] review: upgrade the ATS version --- ats/{8.0.5 => 9.2.4-rc0}/22.03-lts-sp3/Dockerfile | 0 ats/README.md | 2 +- ats/doc/image-info.yaml | 2 +- ats/meta.yaml | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename ats/{8.0.5 => 9.2.4-rc0}/22.03-lts-sp3/Dockerfile (100%) diff --git a/ats/8.0.5/22.03-lts-sp3/Dockerfile b/ats/9.2.4-rc0/22.03-lts-sp3/Dockerfile similarity index 100% rename from ats/8.0.5/22.03-lts-sp3/Dockerfile rename to ats/9.2.4-rc0/22.03-lts-sp3/Dockerfile diff --git a/ats/README.md b/ats/README.md index 2ac17672..375723ee 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 4bae980f..baa77806 100644 --- a/ats/doc/image-info.yaml +++ b/ats/doc/image-info.yaml @@ -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 1128f7bf..48cf7324 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 -- Gitee From 6b4ea0f1ac2c7bef2b8520232bf206b9821b2867 Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Wed, 15 May 2024 16:18:58 +0800 Subject: [PATCH 5/5] ats: modify app category --- ats/doc/image-info.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ats/doc/image-info.yaml b/ats/doc/image-info.yaml index baa77806..b6588711 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执行如下命令 -- Gitee