From 4016cc1d00dc7857744106a42d33c4b658f66dad Mon Sep 17 00:00:00 2001 From: wjunLu Date: Wed, 16 Apr 2025 09:14:19 +0800 Subject: [PATCH 1/2] Add cloud images --- Cloud/calico/3.29.3/24.03-lts-sp1/Dockerfile | 12 +++++++++ Cloud/calico/meta.yml | 2 ++ Cloud/flannel/0.26.5/24.03-lts-sp1/Dockerfile | 25 +++++++++++++++++++ Cloud/flannel/meta.yml | 2 ++ Cloud/image-list.yml | 4 ++- Cloud/istio/1.25.1/24.03-lts-sp1/Dockerfile | 13 ++++++++++ Cloud/istio/meta.yml | 2 ++ 7 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 Cloud/calico/3.29.3/24.03-lts-sp1/Dockerfile create mode 100644 Cloud/calico/meta.yml create mode 100644 Cloud/flannel/0.26.5/24.03-lts-sp1/Dockerfile create mode 100644 Cloud/flannel/meta.yml create mode 100644 Cloud/istio/1.25.1/24.03-lts-sp1/Dockerfile create mode 100644 Cloud/istio/meta.yml diff --git a/Cloud/calico/3.29.3/24.03-lts-sp1/Dockerfile b/Cloud/calico/3.29.3/24.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..7a9e04a3 --- /dev/null +++ b/Cloud/calico/3.29.3/24.03-lts-sp1/Dockerfile @@ -0,0 +1,12 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp1 +FROM ${BASE} + +ARG TARGETARCH +ARG VERSION=3.29.3 + +RUN yum install -y gcc gcc-c++ java-1.8.0-openjdk javacc +RUN curl -fSL -o calicoctl https://github.com/projectcalico/calico/releases/download/v${VERSION}/calicoctl-linux-${TARGETARCH} && \ + mv calicoctl /usr/bin/calicoctl && \ + chmod 755 /usr/bin/calicoctl + +ENTRYPOINT ["/usr/bin/calicoctl"] \ No newline at end of file diff --git a/Cloud/calico/meta.yml b/Cloud/calico/meta.yml new file mode 100644 index 00000000..676af6aa --- /dev/null +++ b/Cloud/calico/meta.yml @@ -0,0 +1,2 @@ +3.29.3-oe2403sp1: + path: 3.29.3/24.03-lts-sp1/Dockerfile \ No newline at end of file diff --git a/Cloud/flannel/0.26.5/24.03-lts-sp1/Dockerfile b/Cloud/flannel/0.26.5/24.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..16ab9a1b --- /dev/null +++ b/Cloud/flannel/0.26.5/24.03-lts-sp1/Dockerfile @@ -0,0 +1,25 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp1 +FROM ${BASE} + +ARG TARGETARCH +ARG VERSION=0.26.5 +ARG GO_VERSION=1.23.7 +ARG FLANNEL_URL=https://github.com/flannel-io/flannel/archive/refs/tags/v${VERSION}.tar.gz + +WORKDIR /app +RUN curl -fSL -o go.tar.gz https://golang.google.cn/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz && \ + tar -xvf go.tar.gz -C /usr/local +ENV PATH="/usr/local/go/bin:${PATH}" + +RUN yum install -y conntrack-tools ipset net-tools && \ + yum clean all +RUN curl -fSL ${FLANNEL_URL} -o flannel.tar.gz && \ + tar -xzf flannel.tar.gz && \ + cd flannel-* && \ + go build && \ + cp flannel /usr/bin/ && \ + cd .. && \ + rm -rf flannel-* flannel.tar.gz && \ + chmod a+x /usr/bin/flannel + +ENTRYPOINT ["/usr/bin/flannel"] \ No newline at end of file diff --git a/Cloud/flannel/meta.yml b/Cloud/flannel/meta.yml new file mode 100644 index 00000000..2fa2f4b8 --- /dev/null +++ b/Cloud/flannel/meta.yml @@ -0,0 +1,2 @@ +0.26.5-oe2403sp1: + path: 0.26.5/24.03-lts-sp1/Dockerfile \ No newline at end of file diff --git a/Cloud/image-list.yml b/Cloud/image-list.yml index c3c56bca..f38aa52c 100644 --- a/Cloud/image-list.yml +++ b/Cloud/image-list.yml @@ -18,4 +18,6 @@ images: telegraf: telegraf tempo: tempo traefik: traefik - zookeeper: zookeeper \ No newline at end of file + zookeeper: zookeeper + flannel: flannel + istio: istio \ No newline at end of file diff --git a/Cloud/istio/1.25.1/24.03-lts-sp1/Dockerfile b/Cloud/istio/1.25.1/24.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..b40f85b2 --- /dev/null +++ b/Cloud/istio/1.25.1/24.03-lts-sp1/Dockerfile @@ -0,0 +1,13 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp1 +FROM ${BASE} + +ARG TARGETARCH +ARG VERSION=1.25.1 + +RUN curl -fSL -o istio.tar.gz https://github.com/istio/istio/releases/download/${VERSION}/istio-${VERSION}-linux-${TARGETARCH}.tar.gz && \ + mkdir -p /usr/local/istio/ && \ + tar -zxf istio.tar.gz -C /usr/local/istio/ --strip-components=1 + +ENV PATH=$PATH:/usr/local/istio/bin/ + +CMD ["istioctl", "version"] diff --git a/Cloud/istio/meta.yml b/Cloud/istio/meta.yml new file mode 100644 index 00000000..570fd66d --- /dev/null +++ b/Cloud/istio/meta.yml @@ -0,0 +1,2 @@ +1.25.1-oe2403sp1: + path: 1.25.1/24.03-lts-sp1/Dockerfile \ No newline at end of file -- Gitee From 50a27c0a9dae0500df55492bf2af4d46d44a3b69 Mon Sep 17 00:00:00 2001 From: wjunLu Date: Thu, 17 Apr 2025 10:10:45 +0800 Subject: [PATCH 2/2] bugfix --- .../{0.26.5 => 0.26.7}/24.03-lts-sp1/Dockerfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) rename Cloud/flannel/{0.26.5 => 0.26.7}/24.03-lts-sp1/Dockerfile (65%) diff --git a/Cloud/flannel/0.26.5/24.03-lts-sp1/Dockerfile b/Cloud/flannel/0.26.7/24.03-lts-sp1/Dockerfile similarity index 65% rename from Cloud/flannel/0.26.5/24.03-lts-sp1/Dockerfile rename to Cloud/flannel/0.26.7/24.03-lts-sp1/Dockerfile index 16ab9a1b..ebbe5378 100644 --- a/Cloud/flannel/0.26.5/24.03-lts-sp1/Dockerfile +++ b/Cloud/flannel/0.26.7/24.03-lts-sp1/Dockerfile @@ -2,7 +2,8 @@ ARG BASE=openeuler/openeuler:24.03-lts-sp1 FROM ${BASE} ARG TARGETARCH -ARG VERSION=0.26.5 +ARG CGOFLAG=0 +ARG VERSION=0.26.7 ARG GO_VERSION=1.23.7 ARG FLANNEL_URL=https://github.com/flannel-io/flannel/archive/refs/tags/v${VERSION}.tar.gz @@ -11,15 +12,19 @@ RUN curl -fSL -o go.tar.gz https://golang.google.cn/dl/go${GO_VERSION}.linux-${T tar -xvf go.tar.gz -C /usr/local ENV PATH="/usr/local/go/bin:${PATH}" -RUN yum install -y conntrack-tools ipset net-tools && \ - yum clean all -RUN curl -fSL ${FLANNEL_URL} -o flannel.tar.gz && \ +RUN yum install -y conntrack-tools ipset net-tools +RUN if [ ${TARGETARCH} = "amd64" ]; then \ + CGOFLAG=1; \ + yum install -y gcc ; \ + fi && \ + curl -fSL ${FLANNEL_URL} -o flannel.tar.gz && \ tar -xzf flannel.tar.gz && \ cd flannel-* && \ - go build && \ + CGO_ENABLED=${CGOFLAG} go build && \ cp flannel /usr/bin/ && \ cd .. && \ rm -rf flannel-* flannel.tar.gz && \ + yum clean all && \ chmod a+x /usr/bin/flannel ENTRYPOINT ["/usr/bin/flannel"] \ No newline at end of file -- Gitee