From 0cc73a2c7f142dee789f29d3cf05c6b6c272b943 Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Wed, 13 Nov 2024 09:59:40 +0800 Subject: [PATCH 1/2] fix: Rebuild the image that failed before --- alertmanager/0.28.0-rc.0/24.03-lts/Dockerfile | 2 +- bind9/9.21.2/22.03-lts-sp1/Dockerfile | 35 ----------------- bind9/9.21.2/22.03-lts-sp1/named | 2 - bind9/9.21.2/22.03-lts-sp1/named.conf | 39 ------------------- bind9/9.21.2/22.03-lts-sp3/Dockerfile | 35 ----------------- bind9/9.21.2/22.03-lts-sp3/named | 2 - bind9/9.21.2/22.03-lts-sp3/named.conf | 39 ------------------- bind9/9.21.2/22.03-lts-sp4/Dockerfile | 35 ----------------- bind9/9.21.2/22.03-lts-sp4/named | 2 - bind9/9.21.2/22.03-lts-sp4/named.conf | 39 ------------------- bind9/9.21.2/24.03-lts/Dockerfile | 35 ----------------- bind9/9.21.2/24.03-lts/named | 2 - bind9/9.21.2/24.03-lts/named.conf | 39 ------------------- bind9/meta.yml | 10 +---- kafka/3.8.0/22.03-lts-sp1/Dockerfile | 6 +-- karma/0.120/22.03-lts-sp1/Dockerfile | 6 +-- karma/0.120/22.03-lts-sp3/Dockerfile | 6 +-- karma/0.120/22.03-lts-sp4/Dockerfile | 6 +-- karma/0.120/24.03-lts/Dockerfile | 6 +-- loki/3.2.1/22.03-lts-sp1/Dockerfile | 10 ++--- loki/3.2.1/22.03-lts-sp3/Dockerfile | 10 ++--- loki/3.2.1/22.03-lts-sp4/Dockerfile | 10 ++--- loki/3.2.1/24.03-lts/Dockerfile | 8 ++-- memcached/1.6.32/24.03-lts/Dockerfile | 6 +-- mlflow/2.17.1/20.03-lts-sp4/Dockerfile | 2 +- mlflow/2.17.1/24.03-lts/Dockerfile | 2 +- mlflow/2.17.2/24.03-lts/Dockerfile | 2 +- mysql/9.1.0/22.03-lts-sp1/Dockerfile | 10 ++--- mysql/9.1.0/22.03-lts-sp3/Dockerfile | 10 ++--- mysql/9.1.0/22.03-lts-sp4/Dockerfile | 10 ++--- mysql/9.1.0/24.03-lts/Dockerfile | 10 ++--- 31 files changed, 52 insertions(+), 384 deletions(-) delete mode 100644 bind9/9.21.2/22.03-lts-sp1/Dockerfile delete mode 100644 bind9/9.21.2/22.03-lts-sp1/named delete mode 100644 bind9/9.21.2/22.03-lts-sp1/named.conf delete mode 100644 bind9/9.21.2/22.03-lts-sp3/Dockerfile delete mode 100644 bind9/9.21.2/22.03-lts-sp3/named delete mode 100644 bind9/9.21.2/22.03-lts-sp3/named.conf delete mode 100644 bind9/9.21.2/22.03-lts-sp4/Dockerfile delete mode 100644 bind9/9.21.2/22.03-lts-sp4/named delete mode 100644 bind9/9.21.2/22.03-lts-sp4/named.conf delete mode 100644 bind9/9.21.2/24.03-lts/Dockerfile delete mode 100644 bind9/9.21.2/24.03-lts/named delete mode 100644 bind9/9.21.2/24.03-lts/named.conf diff --git a/alertmanager/0.28.0-rc.0/24.03-lts/Dockerfile b/alertmanager/0.28.0-rc.0/24.03-lts/Dockerfile index a4b6b099..1f84dad3 100644 --- a/alertmanager/0.28.0-rc.0/24.03-lts/Dockerfile +++ b/alertmanager/0.28.0-rc.0/24.03-lts/Dockerfile @@ -4,7 +4,7 @@ FROM ${BASE} ARG TARGETARCH ARG VERSION=0.28.0-rc.0 -RUN yum update -y && yum install -y wget && \ +RUN yum update -y && yum install -y wget shadow-utils && \ wget -O alertmanager.tar.gz https://github.com/prometheus/alertmanager/releases/download/v${VERSION}/alertmanager-${VERSION}.linux-${TARGETARCH}.tar.gz && \ mkdir /alertmanager && tar -zxvf alertmanager.tar.gz -C /alertmanager --strip-components 1 diff --git a/bind9/9.21.2/22.03-lts-sp1/Dockerfile b/bind9/9.21.2/22.03-lts-sp1/Dockerfile deleted file mode 100644 index 133e3870..00000000 --- a/bind9/9.21.2/22.03-lts-sp1/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -ARG BASE=openeuler/openeuler:22.03-lts-sp1 -FROM ${BASE} - -ARG VERSION=9.21.2 - -RUN yum -y update && yum -y install make gcc xz libcap-devel libuv-devel libnghttp2-devel openssl-devel perl && yum clean all -RUN curl -fSL --output bind9.tar.xz https://downloads.isc.org/isc/bind9/${VERSION}/bind-${VERSION}.tar.xz && \ - mkdir -p /bind9 && tar -xvf bind9.tar.xz -C /bind9 --strip-components=1 && \ - rm -rf bind9.tar.xz && cd /bind9 && \ - ./configure \ - --enable-syscalls \ - --prefix=/usr/local/bind9 \ - --enable-threads \ - --with-openssl=yes \ - --enable-openssl-version-check \ - --enable-ipv6 \ - --disable-linux-caps && \ - make -j "$(nproc)" && make install - -ENV PATH=/usr/local/bind9/bin:/usr/local/bind9/sbin:$PATH -RUN mkdir /usr/local/bind9/dev && \ - mknod -m 666 /usr/local/bind9/dev/null c 1 3 && \ - mknod -m 666 /usr/local/bind9/dev/random c 1 8 && \ - mkdir -p /usr/local/bind9/data && \ - mkdir -p /usr/local/bind9/var/log - -COPY named /etc/sysconfig/named -COPY named.conf /usr/local/bind9/etc/named.conf -RUN /usr/local/bind9/sbin/rndc-confgen -a && \ - ln -s /usr/local/bind9/etc/rndc.key /etc/rndc.key && \ - ln -s /usr/local/bind9/etc/named.conf /etc/named.conf - -EXPOSE 53 953 - -CMD ["named", "-g", "-t", "/usr/local/bind9", "-c", "/etc/named.conf"] \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp1/named b/bind9/9.21.2/22.03-lts-sp1/named deleted file mode 100644 index f521f505..00000000 --- a/bind9/9.21.2/22.03-lts-sp1/named +++ /dev/null @@ -1,2 +0,0 @@ -ROOTDIR=/usr/local/bind9 -OPTIONS=-4 \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp1/named.conf b/bind9/9.21.2/22.03-lts-sp1/named.conf deleted file mode 100644 index b2d954e0..00000000 --- a/bind9/9.21.2/22.03-lts-sp1/named.conf +++ /dev/null @@ -1,39 +0,0 @@ -Controls { - inet 127.0.0.1 allow { localhost; } keys { rndc-key; }; -}; - -include "/etc/rndc.key"; - -acl "internal-network" { - localhost; - 127.0.0.1/32; - 172.16.0.0/12; - 192.168.0.0/16; -}; - -options { - version "unknown"; - hostname "ns1.test.example.com"; - - directory "/var"; - dump-file "/data/cache_dump.db"; - statistics-file "/data/named_status.dat"; - pid-file "/var/run/named/named.pid"; - - listen-on port 53 { - internal-network; - }; - - allow-query { internal-network; }; - dnssec-validation no; - recursion yes; - allow-recursion { internal-network; }; - - notify yes; - max-transfer-time-in 60; - transfer-format many-answers; - transfers-in 10; - transfers-per-ns 2; - allow-transfer { none; }; - allow-update { none; }; -}; \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp3/Dockerfile b/bind9/9.21.2/22.03-lts-sp3/Dockerfile deleted file mode 100644 index 460f1a0f..00000000 --- a/bind9/9.21.2/22.03-lts-sp3/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -ARG BASE=openeuler/openeuler:22.03-lts-sp3 -FROM ${BASE} - -ARG VERSION=9.21.2 - -RUN yum -y update && yum -y install make gcc xz libcap-devel libuv-devel libnghttp2-devel openssl-devel perl && yum clean all -RUN curl -fSL --output bind9.tar.xz https://downloads.isc.org/isc/bind9/${VERSION}/bind-${VERSION}.tar.xz && \ - mkdir -p /bind9 && tar -xvf bind9.tar.xz -C /bind9 --strip-components=1 && \ - rm -rf bind9.tar.xz && cd /bind9 && \ - ./configure \ - --enable-syscalls \ - --prefix=/usr/local/bind9 \ - --enable-threads \ - --with-openssl=yes \ - --enable-openssl-version-check \ - --enable-ipv6 \ - --disable-linux-caps && \ - make -j "$(nproc)" && make install - -ENV PATH=/usr/local/bind9/bin:/usr/local/bind9/sbin:$PATH -RUN mkdir /usr/local/bind9/dev && \ - mknod -m 666 /usr/local/bind9/dev/null c 1 3 && \ - mknod -m 666 /usr/local/bind9/dev/random c 1 8 && \ - mkdir -p /usr/local/bind9/data && \ - mkdir -p /usr/local/bind9/var/log - -COPY named /etc/sysconfig/named -COPY named.conf /usr/local/bind9/etc/named.conf -RUN /usr/local/bind9/sbin/rndc-confgen -a && \ - ln -s /usr/local/bind9/etc/rndc.key /etc/rndc.key && \ - ln -s /usr/local/bind9/etc/named.conf /etc/named.conf - -EXPOSE 53 953 - -CMD ["named", "-g", "-t", "/usr/local/bind9", "-c", "/etc/named.conf"] \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp3/named b/bind9/9.21.2/22.03-lts-sp3/named deleted file mode 100644 index f521f505..00000000 --- a/bind9/9.21.2/22.03-lts-sp3/named +++ /dev/null @@ -1,2 +0,0 @@ -ROOTDIR=/usr/local/bind9 -OPTIONS=-4 \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp3/named.conf b/bind9/9.21.2/22.03-lts-sp3/named.conf deleted file mode 100644 index b2d954e0..00000000 --- a/bind9/9.21.2/22.03-lts-sp3/named.conf +++ /dev/null @@ -1,39 +0,0 @@ -Controls { - inet 127.0.0.1 allow { localhost; } keys { rndc-key; }; -}; - -include "/etc/rndc.key"; - -acl "internal-network" { - localhost; - 127.0.0.1/32; - 172.16.0.0/12; - 192.168.0.0/16; -}; - -options { - version "unknown"; - hostname "ns1.test.example.com"; - - directory "/var"; - dump-file "/data/cache_dump.db"; - statistics-file "/data/named_status.dat"; - pid-file "/var/run/named/named.pid"; - - listen-on port 53 { - internal-network; - }; - - allow-query { internal-network; }; - dnssec-validation no; - recursion yes; - allow-recursion { internal-network; }; - - notify yes; - max-transfer-time-in 60; - transfer-format many-answers; - transfers-in 10; - transfers-per-ns 2; - allow-transfer { none; }; - allow-update { none; }; -}; \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp4/Dockerfile b/bind9/9.21.2/22.03-lts-sp4/Dockerfile deleted file mode 100644 index da893842..00000000 --- a/bind9/9.21.2/22.03-lts-sp4/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -ARG BASE=openeuler/openeuler:22.03-lts-sp4 -FROM ${BASE} - -ARG VERSION=9.21.2 - -RUN yum -y update && yum -y install make gcc xz libcap-devel libuv-devel libnghttp2-devel openssl-devel perl && yum clean all -RUN curl -fSL --output bind9.tar.xz https://downloads.isc.org/isc/bind9/${VERSION}/bind-${VERSION}.tar.xz && \ - mkdir -p /bind9 && tar -xvf bind9.tar.xz -C /bind9 --strip-components=1 && \ - rm -rf bind9.tar.xz && cd /bind9 && \ - ./configure \ - --enable-syscalls \ - --prefix=/usr/local/bind9 \ - --enable-threads \ - --with-openssl=yes \ - --enable-openssl-version-check \ - --enable-ipv6 \ - --disable-linux-caps && \ - make -j "$(nproc)" && make install - -ENV PATH=/usr/local/bind9/bin:/usr/local/bind9/sbin:$PATH -RUN mkdir /usr/local/bind9/dev && \ - mknod -m 666 /usr/local/bind9/dev/null c 1 3 && \ - mknod -m 666 /usr/local/bind9/dev/random c 1 8 && \ - mkdir -p /usr/local/bind9/data && \ - mkdir -p /usr/local/bind9/var/log - -COPY named /etc/sysconfig/named -COPY named.conf /usr/local/bind9/etc/named.conf -RUN /usr/local/bind9/sbin/rndc-confgen -a && \ - ln -s /usr/local/bind9/etc/rndc.key /etc/rndc.key && \ - ln -s /usr/local/bind9/etc/named.conf /etc/named.conf - -EXPOSE 53 953 - -CMD ["named", "-g", "-t", "/usr/local/bind9", "-c", "/etc/named.conf"] \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp4/named b/bind9/9.21.2/22.03-lts-sp4/named deleted file mode 100644 index f521f505..00000000 --- a/bind9/9.21.2/22.03-lts-sp4/named +++ /dev/null @@ -1,2 +0,0 @@ -ROOTDIR=/usr/local/bind9 -OPTIONS=-4 \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp4/named.conf b/bind9/9.21.2/22.03-lts-sp4/named.conf deleted file mode 100644 index b2d954e0..00000000 --- a/bind9/9.21.2/22.03-lts-sp4/named.conf +++ /dev/null @@ -1,39 +0,0 @@ -Controls { - inet 127.0.0.1 allow { localhost; } keys { rndc-key; }; -}; - -include "/etc/rndc.key"; - -acl "internal-network" { - localhost; - 127.0.0.1/32; - 172.16.0.0/12; - 192.168.0.0/16; -}; - -options { - version "unknown"; - hostname "ns1.test.example.com"; - - directory "/var"; - dump-file "/data/cache_dump.db"; - statistics-file "/data/named_status.dat"; - pid-file "/var/run/named/named.pid"; - - listen-on port 53 { - internal-network; - }; - - allow-query { internal-network; }; - dnssec-validation no; - recursion yes; - allow-recursion { internal-network; }; - - notify yes; - max-transfer-time-in 60; - transfer-format many-answers; - transfers-in 10; - transfers-per-ns 2; - allow-transfer { none; }; - allow-update { none; }; -}; \ No newline at end of file diff --git a/bind9/9.21.2/24.03-lts/Dockerfile b/bind9/9.21.2/24.03-lts/Dockerfile deleted file mode 100644 index b5e87883..00000000 --- a/bind9/9.21.2/24.03-lts/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -ARG BASE=openeuler/openeuler:24.03-lts -FROM ${BASE} - -ARG VERSION=9.21.2 - -RUN yum -y update && yum -y install make gcc xz libcap-devel libuv-devel libnghttp2-devel openssl-devel perl && yum clean all -RUN curl -fSL --output bind9.tar.xz https://downloads.isc.org/isc/bind9/${VERSION}/bind-${VERSION}.tar.xz && \ - mkdir -p /bind9 && tar -xvf bind9.tar.xz -C /bind9 --strip-components=1 && \ - rm -rf bind9.tar.xz && cd /bind9 && \ - ./configure \ - --enable-syscalls \ - --prefix=/usr/local/bind9 \ - --enable-threads \ - --with-openssl=yes \ - --enable-openssl-version-check \ - --enable-ipv6 \ - --disable-linux-caps && \ - make -j "$(nproc)" && make install - -ENV PATH=/usr/local/bind9/bin:/usr/local/bind9/sbin:$PATH -RUN mkdir /usr/local/bind9/dev && \ - mknod -m 666 /usr/local/bind9/dev/null c 1 3 && \ - mknod -m 666 /usr/local/bind9/dev/random c 1 8 && \ - mkdir -p /usr/local/bind9/data && \ - mkdir -p /usr/local/bind9/var/log - -COPY named /etc/sysconfig/named -COPY named.conf /usr/local/bind9/etc/named.conf -RUN /usr/local/bind9/sbin/rndc-confgen -a && \ - ln -s /usr/local/bind9/etc/rndc.key /etc/rndc.key && \ - ln -s /usr/local/bind9/etc/named.conf /etc/named.conf - -EXPOSE 53 953 - -CMD ["named", "-g", "-t", "/usr/local/bind9", "-c", "/etc/named.conf"] \ No newline at end of file diff --git a/bind9/9.21.2/24.03-lts/named b/bind9/9.21.2/24.03-lts/named deleted file mode 100644 index f521f505..00000000 --- a/bind9/9.21.2/24.03-lts/named +++ /dev/null @@ -1,2 +0,0 @@ -ROOTDIR=/usr/local/bind9 -OPTIONS=-4 \ No newline at end of file diff --git a/bind9/9.21.2/24.03-lts/named.conf b/bind9/9.21.2/24.03-lts/named.conf deleted file mode 100644 index b2d954e0..00000000 --- a/bind9/9.21.2/24.03-lts/named.conf +++ /dev/null @@ -1,39 +0,0 @@ -Controls { - inet 127.0.0.1 allow { localhost; } keys { rndc-key; }; -}; - -include "/etc/rndc.key"; - -acl "internal-network" { - localhost; - 127.0.0.1/32; - 172.16.0.0/12; - 192.168.0.0/16; -}; - -options { - version "unknown"; - hostname "ns1.test.example.com"; - - directory "/var"; - dump-file "/data/cache_dump.db"; - statistics-file "/data/named_status.dat"; - pid-file "/var/run/named/named.pid"; - - listen-on port 53 { - internal-network; - }; - - allow-query { internal-network; }; - dnssec-validation no; - recursion yes; - allow-recursion { internal-network; }; - - notify yes; - max-transfer-time-in 60; - transfer-format many-answers; - transfers-in 10; - transfers-per-ns 2; - allow-transfer { none; }; - allow-update { none; }; -}; \ No newline at end of file diff --git a/bind9/meta.yml b/bind9/meta.yml index 0ecb75e3..adfae706 100644 --- a/bind9/meta.yml +++ b/bind9/meta.yml @@ -1,10 +1,2 @@ 9.18.24-oe2203sp3: - path: bind9/9.18.24/22.03-lts-sp3/Dockerfile -9.21.2-oe2203sp1: - path: bind9/9.21.2/22.03-lts-sp1/Dockerfile -9.21.2-oe2203sp3: - path: bind9/9.21.2/22.03-lts-sp3/Dockerfile -9.21.2-oe2203sp4: - path: bind9/9.21.2/22.03-lts-sp4/Dockerfile -9.21.2-oe2403lts: - path: bind9/9.21.2/24.03-lts/Dockerfile \ No newline at end of file + path: bind9/9.18.24/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/kafka/3.8.0/22.03-lts-sp1/Dockerfile b/kafka/3.8.0/22.03-lts-sp1/Dockerfile index 6b73036e..f14512f5 100644 --- a/kafka/3.8.0/22.03-lts-sp1/Dockerfile +++ b/kafka/3.8.0/22.03-lts-sp1/Dockerfile @@ -7,9 +7,9 @@ ARG VERSION=3.8.0 ARG SCALA_VERSION=2.13 ARG KAFKA_URL=https://archive.apache.org/dist/kafka/${VERSION}/kafka_${SCALA_VERSION}-${VERSION}.tgz -RUN yum -y install wget hostname java-1.8.0-openjdk java-1.8.0-openjdk-devel +RUN yum -y install hostname java-1.8.0-openjdk java-1.8.0-openjdk-devel RUN mkdir opt/kafka; \ - wget -O kafka.tgz "${KAFKA_URL}"; \ + curl -fSL --output kafka.tgz "${KAFKA_URL}"; \ tar xfz kafka.tgz -C /opt/kafka --strip-components 1; \ mkdir -p /var/lib/kafka/data /etc/kafka/secrets; \ mkdir -p /etc/kafka/docker /usr/logs /mnt/shared/config; \ @@ -21,7 +21,7 @@ RUN mkdir opt/kafka; \ cp /opt/kafka/config/tools-log4j.properties /etc/kafka/docker/tools-log4j.properties; \ cp /opt/kafka/config/kraft/server.properties /etc/kafka/docker/server.properties; \ rm kafka.tgz; \ - yum remove wget findutils; \ + yum remove findutils; \ yum clean all COPY --chown=appuser:appuser scripts /etc/kafka/docker diff --git a/karma/0.120/22.03-lts-sp1/Dockerfile b/karma/0.120/22.03-lts-sp1/Dockerfile index 11d6fe80..9e7f3436 100644 --- a/karma/0.120/22.03-lts-sp1/Dockerfile +++ b/karma/0.120/22.03-lts-sp1/Dockerfile @@ -4,13 +4,11 @@ FROM ${BASE} ARG TARGETARCH ARG VERSION=0.120 -RUN yum update -y && yum install -y wget && \ - wget -O karma.tar.gz https://github.com/prymitive/karma/releases/download/v${VERSION}/karma-linux-${TARGETARCH}.tar.gz && \ +RUN curl -fSL --output karma.tar.gz https://github.com/prymitive/karma/releases/download/v${VERSION}/karma-linux-${TARGETARCH}.tar.gz && \ tar -zxvf karma.tar.gz -C /usr/bin/ && \ mv /usr/bin/karma-linux-${TARGETARCH} /usr/bin/karma && \ chmod +x /usr/bin/karma && \ - rm -rf karma.tar.gz && \ - yum remove -y wget && yum clean all + rm -rf karma.tar.gz EXPOSE 8080 ENTRYPOINT ["karma"] \ No newline at end of file diff --git a/karma/0.120/22.03-lts-sp3/Dockerfile b/karma/0.120/22.03-lts-sp3/Dockerfile index 8cc32310..01f3e1ac 100644 --- a/karma/0.120/22.03-lts-sp3/Dockerfile +++ b/karma/0.120/22.03-lts-sp3/Dockerfile @@ -4,13 +4,11 @@ FROM ${BASE} ARG TARGETARCH ARG VERSION=0.120 -RUN yum update -y && yum install -y wget && \ - wget -O karma.tar.gz https://github.com/prymitive/karma/releases/download/v${VERSION}/karma-linux-${TARGETARCH}.tar.gz && \ +RUN curl -fSL --output karma.tar.gz https://github.com/prymitive/karma/releases/download/v${VERSION}/karma-linux-${TARGETARCH}.tar.gz && \ tar -zxvf karma.tar.gz -C /usr/bin/ && \ mv /usr/bin/karma-linux-${TARGETARCH} /usr/bin/karma && \ chmod +x /usr/bin/karma && \ - rm -rf karma.tar.gz && \ - yum remove -y wget && yum clean all + rm -rf karma.tar.gz EXPOSE 8080 ENTRYPOINT ["karma"] \ No newline at end of file diff --git a/karma/0.120/22.03-lts-sp4/Dockerfile b/karma/0.120/22.03-lts-sp4/Dockerfile index 547d5553..cb9a9ee1 100644 --- a/karma/0.120/22.03-lts-sp4/Dockerfile +++ b/karma/0.120/22.03-lts-sp4/Dockerfile @@ -4,13 +4,11 @@ FROM ${BASE} ARG TARGETARCH ARG VERSION=0.120 -RUN yum update -y && yum install -y wget && \ - wget -O karma.tar.gz https://github.com/prymitive/karma/releases/download/v${VERSION}/karma-linux-${TARGETARCH}.tar.gz && \ +RUN curl -fSL --output karma.tar.gz https://github.com/prymitive/karma/releases/download/v${VERSION}/karma-linux-${TARGETARCH}.tar.gz && \ tar -zxvf karma.tar.gz -C /usr/bin/ && \ mv /usr/bin/karma-linux-${TARGETARCH} /usr/bin/karma && \ chmod +x /usr/bin/karma && \ - rm -rf karma.tar.gz && \ - yum remove -y wget && yum clean all + rm -rf karma.tar.gz EXPOSE 8080 ENTRYPOINT ["karma"] \ No newline at end of file diff --git a/karma/0.120/24.03-lts/Dockerfile b/karma/0.120/24.03-lts/Dockerfile index 66dee35d..64073ac4 100644 --- a/karma/0.120/24.03-lts/Dockerfile +++ b/karma/0.120/24.03-lts/Dockerfile @@ -4,13 +4,11 @@ FROM ${BASE} ARG TARGETARCH ARG VERSION=0.120 -RUN yum update -y && yum install -y wget && \ - wget -O karma.tar.gz https://github.com/prymitive/karma/releases/download/v${VERSION}/karma-linux-${TARGETARCH}.tar.gz && \ +RUN curl -fSL --output karma.tar.gz https://github.com/prymitive/karma/releases/download/v${VERSION}/karma-linux-${TARGETARCH}.tar.gz && \ tar -zxvf karma.tar.gz -C /usr/bin/ && \ mv /usr/bin/karma-linux-${TARGETARCH} /usr/bin/karma && \ chmod +x /usr/bin/karma && \ - rm -rf karma.tar.gz && \ - yum remove -y wget && yum clean all + rm -rf karma.tar.gz EXPOSE 8080 ENTRYPOINT ["karma"] \ No newline at end of file diff --git a/loki/3.2.1/22.03-lts-sp1/Dockerfile b/loki/3.2.1/22.03-lts-sp1/Dockerfile index cebd423f..2790f511 100644 --- a/loki/3.2.1/22.03-lts-sp1/Dockerfile +++ b/loki/3.2.1/22.03-lts-sp1/Dockerfile @@ -5,18 +5,14 @@ ARG TARGETARCH ARG BUILDARCH ARG VERSION=3.2.1 -RUN yum -y update && \ - yum -y install wget && \ - yum clean all - RUN if [ "$TARGETARCH" = "amd64" ]; then \ BUILDARCH="x86_64"; \ elif [ "$TARGETARCH" = "arm64" ]; then \ BUILDARCH="aarch64"; \ fi && \ - wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ - wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ - wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \ yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \ rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm diff --git a/loki/3.2.1/22.03-lts-sp3/Dockerfile b/loki/3.2.1/22.03-lts-sp3/Dockerfile index 42b49275..23e15df5 100644 --- a/loki/3.2.1/22.03-lts-sp3/Dockerfile +++ b/loki/3.2.1/22.03-lts-sp3/Dockerfile @@ -5,18 +5,14 @@ ARG TARGETARCH ARG BUILDARCH ARG VERSION=3.2.1 -RUN yum -y update && \ - yum -y install wget && \ - yum clean all - RUN if [ "$TARGETARCH" = "amd64" ]; then \ BUILDARCH="x86_64"; \ elif [ "$TARGETARCH" = "arm64" ]; then \ BUILDARCH="aarch64"; \ fi && \ - wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ - wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ - wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \ yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \ rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm diff --git a/loki/3.2.1/22.03-lts-sp4/Dockerfile b/loki/3.2.1/22.03-lts-sp4/Dockerfile index f1f1be8a..c62b6ecc 100644 --- a/loki/3.2.1/22.03-lts-sp4/Dockerfile +++ b/loki/3.2.1/22.03-lts-sp4/Dockerfile @@ -5,18 +5,14 @@ ARG TARGETARCH ARG BUILDARCH ARG VERSION=3.2.1 -RUN yum -y update && \ - yum -y install wget && \ - yum clean all - RUN if [ "$TARGETARCH" = "amd64" ]; then \ BUILDARCH="x86_64"; \ elif [ "$TARGETARCH" = "arm64" ]; then \ BUILDARCH="aarch64"; \ fi && \ - wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ - wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ - wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \ yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \ rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm diff --git a/loki/3.2.1/24.03-lts/Dockerfile b/loki/3.2.1/24.03-lts/Dockerfile index e1848157..665dd574 100644 --- a/loki/3.2.1/24.03-lts/Dockerfile +++ b/loki/3.2.1/24.03-lts/Dockerfile @@ -6,7 +6,7 @@ ARG BUILDARCH ARG VERSION=3.2.1 RUN yum -y update && \ - yum -y install wget && \ + yum -y install shadow-utils && \ yum clean all RUN if [ "$TARGETARCH" = "amd64" ]; then \ @@ -14,9 +14,9 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \ elif [ "$TARGETARCH" = "arm64" ]; then \ BUILDARCH="aarch64"; \ fi && \ - wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ - wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ - wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \ + curl -fSL --output grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \ yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \ rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm diff --git a/memcached/1.6.32/24.03-lts/Dockerfile b/memcached/1.6.32/24.03-lts/Dockerfile index ee117800..40b1de72 100644 --- a/memcached/1.6.32/24.03-lts/Dockerfile +++ b/memcached/1.6.32/24.03-lts/Dockerfile @@ -4,6 +4,9 @@ FROM ${BASE} ARG TARGETARCH ARG VERSION=1.6.32 +RUN yum -y install gcc make libevent-devel shadow-utils && \ + yum clean all + RUN groupadd --system --gid 11211 memcache && \ useradd --system --gid memcache --uid 11211 memcache && \ mkdir -p /memcache/rules && \ @@ -11,9 +14,6 @@ RUN groupadd --system --gid 11211 memcache && \ mkdir -p /etc/memcache && \ chown -R memcache:memcache /etc/memcache /memcache -RUN yum -y install gcc make libevent-devel && \ - yum clean all - RUN curl -o /tmp/memcached.tar.gz https://www.memcached.org/files/memcached-${VERSION}.tar.gz && \ tar -zxvf /tmp/memcached.tar.gz -C /tmp && \ cd /tmp/memcached-${VERSION} && \ diff --git a/mlflow/2.17.1/20.03-lts-sp4/Dockerfile b/mlflow/2.17.1/20.03-lts-sp4/Dockerfile index 39884c52..f5a25c84 100644 --- a/mlflow/2.17.1/20.03-lts-sp4/Dockerfile +++ b/mlflow/2.17.1/20.03-lts-sp4/Dockerfile @@ -4,7 +4,7 @@ FROM ${BASE} ARG VERSION=2.17.1 -RUN yum install -y python3-pip && yum clean all +RUN yum install -y python3-pip shadow-utils && yum clean all RUN pip3 install mlflow==${VERSION} -i https://pypi.tuna.tsinghua.edu.cn/simple && \ groupadd --gid 10001 mlflow && \ diff --git a/mlflow/2.17.1/24.03-lts/Dockerfile b/mlflow/2.17.1/24.03-lts/Dockerfile index 00d45693..c21e0330 100644 --- a/mlflow/2.17.1/24.03-lts/Dockerfile +++ b/mlflow/2.17.1/24.03-lts/Dockerfile @@ -4,7 +4,7 @@ FROM ${BASE} ARG VERSION=2.17.1 -RUN yum install -y python3-pip && yum clean all +RUN yum install -y python3-pip shadow-utils && yum clean all RUN pip3 install mlflow==${VERSION} -i https://pypi.tuna.tsinghua.edu.cn/simple && \ groupadd --gid 10001 mlflow && \ diff --git a/mlflow/2.17.2/24.03-lts/Dockerfile b/mlflow/2.17.2/24.03-lts/Dockerfile index 7bcfe5a5..0dde5930 100644 --- a/mlflow/2.17.2/24.03-lts/Dockerfile +++ b/mlflow/2.17.2/24.03-lts/Dockerfile @@ -4,7 +4,7 @@ FROM ${BASE} ARG VERSION=2.17.2 -RUN yum install -y python3-pip && yum clean all +RUN yum install -y python3-pip shadow-utils && yum clean all RUN pip3 install mlflow==${VERSION} -i https://pypi.tuna.tsinghua.edu.cn/simple && \ groupadd --gid 10001 mlflow && \ diff --git a/mysql/9.1.0/22.03-lts-sp1/Dockerfile b/mysql/9.1.0/22.03-lts-sp1/Dockerfile index ae0482d4..f2ee2168 100644 --- a/mysql/9.1.0/22.03-lts-sp1/Dockerfile +++ b/mysql/9.1.0/22.03-lts-sp1/Dockerfile @@ -6,11 +6,11 @@ ARG VERSION=9.1.0 ARG GOSU_VERSION=1.17 RUN yum update -y && \ - yum install -y git wget g++ make ncurses-devel cmake openssl openssl-devel libtirpc-devel rpcgen bison m4 && \ + yum install -y git g++ make ncurses-devel cmake openssl openssl-devel libtirpc-devel rpcgen bison m4 && \ mkdir -p /docker-entrypoint-initdb.d && \ - wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" && \ - wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" && \ - wget -O mysql.tar.gz https://github.com/mysql/mysql-server/archive/refs/tags/mysql-${VERSION}.tar.gz && \ + curl -fSL --output /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" && \ + curl -fSL --output /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" && \ + curl -fSL --output mysql.tar.gz https://github.com/mysql/mysql-server/archive/refs/tags/mysql-${VERSION}.tar.gz && \ mkdir -p /mysql && tar -xvf mysql.tar.gz -C /mysql --strip-components=1 && \ mkdir -p /mysql/build && cd /mysql/build && \ cmake /mysql \ @@ -25,7 +25,7 @@ RUN yum update -y && \ make -j "$(nproc)" && make install && \ rm -f mysql.tar.gz && \ rm -rf /mysql && \ - yum -y remove wget g++ make && \ + yum -y remove g++ make && \ yum clean all diff --git a/mysql/9.1.0/22.03-lts-sp3/Dockerfile b/mysql/9.1.0/22.03-lts-sp3/Dockerfile index 6cdd58e0..085373c5 100644 --- a/mysql/9.1.0/22.03-lts-sp3/Dockerfile +++ b/mysql/9.1.0/22.03-lts-sp3/Dockerfile @@ -6,11 +6,11 @@ ARG VERSION=9.1.0 ARG GOSU_VERSION=1.17 RUN yum update -y && \ - yum install -y git wget g++ make ncurses-devel cmake openssl openssl-devel libtirpc-devel rpcgen bison m4 && \ + yum install -y git g++ make ncurses-devel cmake openssl openssl-devel libtirpc-devel rpcgen bison m4 && \ mkdir -p /docker-entrypoint-initdb.d && \ - wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" && \ - wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" && \ - wget -O mysql.tar.gz https://github.com/mysql/mysql-server/archive/refs/tags/mysql-${VERSION}.tar.gz && \ + curl -fSL --output /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" && \ + curl -fSL --output /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" && \ + curl -fSL --output mysql.tar.gz https://github.com/mysql/mysql-server/archive/refs/tags/mysql-${VERSION}.tar.gz && \ mkdir -p /mysql && tar -xvf mysql.tar.gz -C /mysql --strip-components=1 && \ mkdir -p /mysql/build && cd /mysql/build && \ cmake /mysql \ @@ -25,7 +25,7 @@ RUN yum update -y && \ make -j "$(nproc)" && make install && \ rm -f mysql.tar.gz && \ rm -rf /mysql && \ - yum -y remove wget g++ make && \ + yum -y remove g++ make && \ yum clean all diff --git a/mysql/9.1.0/22.03-lts-sp4/Dockerfile b/mysql/9.1.0/22.03-lts-sp4/Dockerfile index 57ed9032..2561c0f1 100644 --- a/mysql/9.1.0/22.03-lts-sp4/Dockerfile +++ b/mysql/9.1.0/22.03-lts-sp4/Dockerfile @@ -6,11 +6,11 @@ ARG VERSION=9.1.0 ARG GOSU_VERSION=1.17 RUN yum update -y && \ - yum install -y git wget g++ make ncurses-devel cmake openssl openssl-devel libtirpc-devel rpcgen bison m4 && \ + yum install -y git g++ make ncurses-devel cmake openssl openssl-devel libtirpc-devel rpcgen bison m4 && \ mkdir -p /docker-entrypoint-initdb.d && \ - wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" && \ - wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" && \ - wget -O mysql.tar.gz https://github.com/mysql/mysql-server/archive/refs/tags/mysql-${VERSION}.tar.gz && \ + curl -fSL --output /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" && \ + curl -fSL --output /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" && \ + curl -fSL --output mysql.tar.gz https://github.com/mysql/mysql-server/archive/refs/tags/mysql-${VERSION}.tar.gz && \ mkdir -p /mysql && tar -xvf mysql.tar.gz -C /mysql --strip-components=1 && \ mkdir -p /mysql/build && cd /mysql/build && \ cmake /mysql \ @@ -25,7 +25,7 @@ RUN yum update -y && \ make -j "$(nproc)" && make install && \ rm -f mysql.tar.gz && \ rm -rf /mysql && \ - yum -y remove wget g++ make && \ + yum -y remove g++ make && \ yum clean all diff --git a/mysql/9.1.0/24.03-lts/Dockerfile b/mysql/9.1.0/24.03-lts/Dockerfile index 1b8211cf..927fc545 100644 --- a/mysql/9.1.0/24.03-lts/Dockerfile +++ b/mysql/9.1.0/24.03-lts/Dockerfile @@ -6,11 +6,11 @@ ARG VERSION=9.1.0 ARG GOSU_VERSION=1.17 RUN yum update -y && \ - yum install -y git wget g++ make ncurses-devel cmake openssl openssl-devel libtirpc-devel rpcgen bison m4 && \ + yum install -y git g++ make ncurses-devel cmake openssl openssl-devel libtirpc-devel rpcgen bison m4 && \ mkdir -p /docker-entrypoint-initdb.d && \ - wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" && \ - wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" && \ - wget -O mysql.tar.gz https://github.com/mysql/mysql-server/archive/refs/tags/mysql-${VERSION}.tar.gz && \ + curl -fSL --output /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}.asc" && \ + curl -fSL --output /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${TARGETARCH}" && \ + curl -fSL --output mysql.tar.gz https://github.com/mysql/mysql-server/archive/refs/tags/mysql-${VERSION}.tar.gz && \ mkdir -p /mysql && tar -xvf mysql.tar.gz -C /mysql --strip-components=1 && \ mkdir -p /mysql/build && cd /mysql/build && \ cmake /mysql \ @@ -25,7 +25,7 @@ RUN yum update -y && \ make -j "$(nproc)" && make install && \ rm -f mysql.tar.gz && \ rm -rf /mysql && \ - yum -y remove wget g++ make && \ + yum -y remove g++ make && \ yum clean all -- Gitee From beb30072c975c6c9e5663313e72c2c97138930f2 Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Wed, 13 Nov 2024 14:59:09 +0800 Subject: [PATCH 2/2] revert bind9 --- .../22.03-lts-sp1\342\200\216/Dockerfile" | 35 +++++++++++++++++ .../9.21.2/22.03-lts-sp1\342\200\216/named" | 2 + .../22.03-lts-sp1\342\200\216/named.conf" | 39 +++++++++++++++++++ bind9/9.21.2/22.03-lts-sp3/Dockerfile | 35 +++++++++++++++++ bind9/9.21.2/22.03-lts-sp3/named | 2 + bind9/9.21.2/22.03-lts-sp3/named.conf | 39 +++++++++++++++++++ bind9/9.21.2/22.03-lts-sp4/Dockerfile | 35 +++++++++++++++++ bind9/9.21.2/22.03-lts-sp4/named | 2 + bind9/9.21.2/22.03-lts-sp4/named.conf | 39 +++++++++++++++++++ bind9/9.21.2/24.03-lts/Dockerfile | 35 +++++++++++++++++ bind9/9.21.2/24.03-lts/named | 2 + bind9/9.21.2/24.03-lts/named.conf | 39 +++++++++++++++++++ bind9/meta.yml | 10 ++++- go/doc/image-info.yml | 2 +- 14 files changed, 314 insertions(+), 2 deletions(-) create mode 100644 "bind9/9.21.2/22.03-lts-sp1\342\200\216/Dockerfile" create mode 100644 "bind9/9.21.2/22.03-lts-sp1\342\200\216/named" create mode 100644 "bind9/9.21.2/22.03-lts-sp1\342\200\216/named.conf" create mode 100644 bind9/9.21.2/22.03-lts-sp3/Dockerfile create mode 100644 bind9/9.21.2/22.03-lts-sp3/named create mode 100644 bind9/9.21.2/22.03-lts-sp3/named.conf create mode 100644 bind9/9.21.2/22.03-lts-sp4/Dockerfile create mode 100644 bind9/9.21.2/22.03-lts-sp4/named create mode 100644 bind9/9.21.2/22.03-lts-sp4/named.conf create mode 100644 bind9/9.21.2/24.03-lts/Dockerfile create mode 100644 bind9/9.21.2/24.03-lts/named create mode 100644 bind9/9.21.2/24.03-lts/named.conf diff --git "a/bind9/9.21.2/22.03-lts-sp1\342\200\216/Dockerfile" "b/bind9/9.21.2/22.03-lts-sp1\342\200\216/Dockerfile" new file mode 100644 index 00000000..133e3870 --- /dev/null +++ "b/bind9/9.21.2/22.03-lts-sp1\342\200\216/Dockerfile" @@ -0,0 +1,35 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp1 +FROM ${BASE} + +ARG VERSION=9.21.2 + +RUN yum -y update && yum -y install make gcc xz libcap-devel libuv-devel libnghttp2-devel openssl-devel perl && yum clean all +RUN curl -fSL --output bind9.tar.xz https://downloads.isc.org/isc/bind9/${VERSION}/bind-${VERSION}.tar.xz && \ + mkdir -p /bind9 && tar -xvf bind9.tar.xz -C /bind9 --strip-components=1 && \ + rm -rf bind9.tar.xz && cd /bind9 && \ + ./configure \ + --enable-syscalls \ + --prefix=/usr/local/bind9 \ + --enable-threads \ + --with-openssl=yes \ + --enable-openssl-version-check \ + --enable-ipv6 \ + --disable-linux-caps && \ + make -j "$(nproc)" && make install + +ENV PATH=/usr/local/bind9/bin:/usr/local/bind9/sbin:$PATH +RUN mkdir /usr/local/bind9/dev && \ + mknod -m 666 /usr/local/bind9/dev/null c 1 3 && \ + mknod -m 666 /usr/local/bind9/dev/random c 1 8 && \ + mkdir -p /usr/local/bind9/data && \ + mkdir -p /usr/local/bind9/var/log + +COPY named /etc/sysconfig/named +COPY named.conf /usr/local/bind9/etc/named.conf +RUN /usr/local/bind9/sbin/rndc-confgen -a && \ + ln -s /usr/local/bind9/etc/rndc.key /etc/rndc.key && \ + ln -s /usr/local/bind9/etc/named.conf /etc/named.conf + +EXPOSE 53 953 + +CMD ["named", "-g", "-t", "/usr/local/bind9", "-c", "/etc/named.conf"] \ No newline at end of file diff --git "a/bind9/9.21.2/22.03-lts-sp1\342\200\216/named" "b/bind9/9.21.2/22.03-lts-sp1\342\200\216/named" new file mode 100644 index 00000000..f521f505 --- /dev/null +++ "b/bind9/9.21.2/22.03-lts-sp1\342\200\216/named" @@ -0,0 +1,2 @@ +ROOTDIR=/usr/local/bind9 +OPTIONS=-4 \ No newline at end of file diff --git "a/bind9/9.21.2/22.03-lts-sp1\342\200\216/named.conf" "b/bind9/9.21.2/22.03-lts-sp1\342\200\216/named.conf" new file mode 100644 index 00000000..b2d954e0 --- /dev/null +++ "b/bind9/9.21.2/22.03-lts-sp1\342\200\216/named.conf" @@ -0,0 +1,39 @@ +Controls { + inet 127.0.0.1 allow { localhost; } keys { rndc-key; }; +}; + +include "/etc/rndc.key"; + +acl "internal-network" { + localhost; + 127.0.0.1/32; + 172.16.0.0/12; + 192.168.0.0/16; +}; + +options { + version "unknown"; + hostname "ns1.test.example.com"; + + directory "/var"; + dump-file "/data/cache_dump.db"; + statistics-file "/data/named_status.dat"; + pid-file "/var/run/named/named.pid"; + + listen-on port 53 { + internal-network; + }; + + allow-query { internal-network; }; + dnssec-validation no; + recursion yes; + allow-recursion { internal-network; }; + + notify yes; + max-transfer-time-in 60; + transfer-format many-answers; + transfers-in 10; + transfers-per-ns 2; + allow-transfer { none; }; + allow-update { none; }; +}; \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp3/Dockerfile b/bind9/9.21.2/22.03-lts-sp3/Dockerfile new file mode 100644 index 00000000..460f1a0f --- /dev/null +++ b/bind9/9.21.2/22.03-lts-sp3/Dockerfile @@ -0,0 +1,35 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp3 +FROM ${BASE} + +ARG VERSION=9.21.2 + +RUN yum -y update && yum -y install make gcc xz libcap-devel libuv-devel libnghttp2-devel openssl-devel perl && yum clean all +RUN curl -fSL --output bind9.tar.xz https://downloads.isc.org/isc/bind9/${VERSION}/bind-${VERSION}.tar.xz && \ + mkdir -p /bind9 && tar -xvf bind9.tar.xz -C /bind9 --strip-components=1 && \ + rm -rf bind9.tar.xz && cd /bind9 && \ + ./configure \ + --enable-syscalls \ + --prefix=/usr/local/bind9 \ + --enable-threads \ + --with-openssl=yes \ + --enable-openssl-version-check \ + --enable-ipv6 \ + --disable-linux-caps && \ + make -j "$(nproc)" && make install + +ENV PATH=/usr/local/bind9/bin:/usr/local/bind9/sbin:$PATH +RUN mkdir /usr/local/bind9/dev && \ + mknod -m 666 /usr/local/bind9/dev/null c 1 3 && \ + mknod -m 666 /usr/local/bind9/dev/random c 1 8 && \ + mkdir -p /usr/local/bind9/data && \ + mkdir -p /usr/local/bind9/var/log + +COPY named /etc/sysconfig/named +COPY named.conf /usr/local/bind9/etc/named.conf +RUN /usr/local/bind9/sbin/rndc-confgen -a && \ + ln -s /usr/local/bind9/etc/rndc.key /etc/rndc.key && \ + ln -s /usr/local/bind9/etc/named.conf /etc/named.conf + +EXPOSE 53 953 + +CMD ["named", "-g", "-t", "/usr/local/bind9", "-c", "/etc/named.conf"] \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp3/named b/bind9/9.21.2/22.03-lts-sp3/named new file mode 100644 index 00000000..f521f505 --- /dev/null +++ b/bind9/9.21.2/22.03-lts-sp3/named @@ -0,0 +1,2 @@ +ROOTDIR=/usr/local/bind9 +OPTIONS=-4 \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp3/named.conf b/bind9/9.21.2/22.03-lts-sp3/named.conf new file mode 100644 index 00000000..b2d954e0 --- /dev/null +++ b/bind9/9.21.2/22.03-lts-sp3/named.conf @@ -0,0 +1,39 @@ +Controls { + inet 127.0.0.1 allow { localhost; } keys { rndc-key; }; +}; + +include "/etc/rndc.key"; + +acl "internal-network" { + localhost; + 127.0.0.1/32; + 172.16.0.0/12; + 192.168.0.0/16; +}; + +options { + version "unknown"; + hostname "ns1.test.example.com"; + + directory "/var"; + dump-file "/data/cache_dump.db"; + statistics-file "/data/named_status.dat"; + pid-file "/var/run/named/named.pid"; + + listen-on port 53 { + internal-network; + }; + + allow-query { internal-network; }; + dnssec-validation no; + recursion yes; + allow-recursion { internal-network; }; + + notify yes; + max-transfer-time-in 60; + transfer-format many-answers; + transfers-in 10; + transfers-per-ns 2; + allow-transfer { none; }; + allow-update { none; }; +}; \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp4/Dockerfile b/bind9/9.21.2/22.03-lts-sp4/Dockerfile new file mode 100644 index 00000000..da893842 --- /dev/null +++ b/bind9/9.21.2/22.03-lts-sp4/Dockerfile @@ -0,0 +1,35 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp4 +FROM ${BASE} + +ARG VERSION=9.21.2 + +RUN yum -y update && yum -y install make gcc xz libcap-devel libuv-devel libnghttp2-devel openssl-devel perl && yum clean all +RUN curl -fSL --output bind9.tar.xz https://downloads.isc.org/isc/bind9/${VERSION}/bind-${VERSION}.tar.xz && \ + mkdir -p /bind9 && tar -xvf bind9.tar.xz -C /bind9 --strip-components=1 && \ + rm -rf bind9.tar.xz && cd /bind9 && \ + ./configure \ + --enable-syscalls \ + --prefix=/usr/local/bind9 \ + --enable-threads \ + --with-openssl=yes \ + --enable-openssl-version-check \ + --enable-ipv6 \ + --disable-linux-caps && \ + make -j "$(nproc)" && make install + +ENV PATH=/usr/local/bind9/bin:/usr/local/bind9/sbin:$PATH +RUN mkdir /usr/local/bind9/dev && \ + mknod -m 666 /usr/local/bind9/dev/null c 1 3 && \ + mknod -m 666 /usr/local/bind9/dev/random c 1 8 && \ + mkdir -p /usr/local/bind9/data && \ + mkdir -p /usr/local/bind9/var/log + +COPY named /etc/sysconfig/named +COPY named.conf /usr/local/bind9/etc/named.conf +RUN /usr/local/bind9/sbin/rndc-confgen -a && \ + ln -s /usr/local/bind9/etc/rndc.key /etc/rndc.key && \ + ln -s /usr/local/bind9/etc/named.conf /etc/named.conf + +EXPOSE 53 953 + +CMD ["named", "-g", "-t", "/usr/local/bind9", "-c", "/etc/named.conf"] \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp4/named b/bind9/9.21.2/22.03-lts-sp4/named new file mode 100644 index 00000000..f521f505 --- /dev/null +++ b/bind9/9.21.2/22.03-lts-sp4/named @@ -0,0 +1,2 @@ +ROOTDIR=/usr/local/bind9 +OPTIONS=-4 \ No newline at end of file diff --git a/bind9/9.21.2/22.03-lts-sp4/named.conf b/bind9/9.21.2/22.03-lts-sp4/named.conf new file mode 100644 index 00000000..b2d954e0 --- /dev/null +++ b/bind9/9.21.2/22.03-lts-sp4/named.conf @@ -0,0 +1,39 @@ +Controls { + inet 127.0.0.1 allow { localhost; } keys { rndc-key; }; +}; + +include "/etc/rndc.key"; + +acl "internal-network" { + localhost; + 127.0.0.1/32; + 172.16.0.0/12; + 192.168.0.0/16; +}; + +options { + version "unknown"; + hostname "ns1.test.example.com"; + + directory "/var"; + dump-file "/data/cache_dump.db"; + statistics-file "/data/named_status.dat"; + pid-file "/var/run/named/named.pid"; + + listen-on port 53 { + internal-network; + }; + + allow-query { internal-network; }; + dnssec-validation no; + recursion yes; + allow-recursion { internal-network; }; + + notify yes; + max-transfer-time-in 60; + transfer-format many-answers; + transfers-in 10; + transfers-per-ns 2; + allow-transfer { none; }; + allow-update { none; }; +}; \ No newline at end of file diff --git a/bind9/9.21.2/24.03-lts/Dockerfile b/bind9/9.21.2/24.03-lts/Dockerfile new file mode 100644 index 00000000..b5e87883 --- /dev/null +++ b/bind9/9.21.2/24.03-lts/Dockerfile @@ -0,0 +1,35 @@ +ARG BASE=openeuler/openeuler:24.03-lts +FROM ${BASE} + +ARG VERSION=9.21.2 + +RUN yum -y update && yum -y install make gcc xz libcap-devel libuv-devel libnghttp2-devel openssl-devel perl && yum clean all +RUN curl -fSL --output bind9.tar.xz https://downloads.isc.org/isc/bind9/${VERSION}/bind-${VERSION}.tar.xz && \ + mkdir -p /bind9 && tar -xvf bind9.tar.xz -C /bind9 --strip-components=1 && \ + rm -rf bind9.tar.xz && cd /bind9 && \ + ./configure \ + --enable-syscalls \ + --prefix=/usr/local/bind9 \ + --enable-threads \ + --with-openssl=yes \ + --enable-openssl-version-check \ + --enable-ipv6 \ + --disable-linux-caps && \ + make -j "$(nproc)" && make install + +ENV PATH=/usr/local/bind9/bin:/usr/local/bind9/sbin:$PATH +RUN mkdir /usr/local/bind9/dev && \ + mknod -m 666 /usr/local/bind9/dev/null c 1 3 && \ + mknod -m 666 /usr/local/bind9/dev/random c 1 8 && \ + mkdir -p /usr/local/bind9/data && \ + mkdir -p /usr/local/bind9/var/log + +COPY named /etc/sysconfig/named +COPY named.conf /usr/local/bind9/etc/named.conf +RUN /usr/local/bind9/sbin/rndc-confgen -a && \ + ln -s /usr/local/bind9/etc/rndc.key /etc/rndc.key && \ + ln -s /usr/local/bind9/etc/named.conf /etc/named.conf + +EXPOSE 53 953 + +CMD ["named", "-g", "-t", "/usr/local/bind9", "-c", "/etc/named.conf"] \ No newline at end of file diff --git a/bind9/9.21.2/24.03-lts/named b/bind9/9.21.2/24.03-lts/named new file mode 100644 index 00000000..f521f505 --- /dev/null +++ b/bind9/9.21.2/24.03-lts/named @@ -0,0 +1,2 @@ +ROOTDIR=/usr/local/bind9 +OPTIONS=-4 \ No newline at end of file diff --git a/bind9/9.21.2/24.03-lts/named.conf b/bind9/9.21.2/24.03-lts/named.conf new file mode 100644 index 00000000..b2d954e0 --- /dev/null +++ b/bind9/9.21.2/24.03-lts/named.conf @@ -0,0 +1,39 @@ +Controls { + inet 127.0.0.1 allow { localhost; } keys { rndc-key; }; +}; + +include "/etc/rndc.key"; + +acl "internal-network" { + localhost; + 127.0.0.1/32; + 172.16.0.0/12; + 192.168.0.0/16; +}; + +options { + version "unknown"; + hostname "ns1.test.example.com"; + + directory "/var"; + dump-file "/data/cache_dump.db"; + statistics-file "/data/named_status.dat"; + pid-file "/var/run/named/named.pid"; + + listen-on port 53 { + internal-network; + }; + + allow-query { internal-network; }; + dnssec-validation no; + recursion yes; + allow-recursion { internal-network; }; + + notify yes; + max-transfer-time-in 60; + transfer-format many-answers; + transfers-in 10; + transfers-per-ns 2; + allow-transfer { none; }; + allow-update { none; }; +}; \ No newline at end of file diff --git a/bind9/meta.yml b/bind9/meta.yml index adfae706..6e0c9eed 100644 --- a/bind9/meta.yml +++ b/bind9/meta.yml @@ -1,2 +1,10 @@ 9.18.24-oe2203sp3: - path: bind9/9.18.24/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: bind9/9.18.24/22.03-lts-sp3/Dockerfile +9.21.2-oe2403lts: + path: bind9/9.21.2/24.03-lts/Dockerfile +9.21.2-oe2203sp3: + path: bind9/9.21.2/22.03-lts-sp3/Dockerfile +9.21.2-oe2203sp4: + path: bind9/9.21.2/22.03-lts-sp4/Dockerfile +9.21.2-oe2203sp1: + path: bind9/9.21.2/22.03-lts-sp1/Dockerfile \ No newline at end of file diff --git a/go/doc/image-info.yml b/go/doc/image-info.yml index 121e6c6d..f46fc774 100644 --- a/go/doc/image-info.yml +++ b/go/doc/image-info.yml @@ -1,4 +1,4 @@ - name: go +name: go category: others description: Go（又称 Golang）是 Google 的 Robert Griesemer，Rob Pike 及 Ken Thompson 开发的一种静态强类型、编译型语言。Go 语言语法与 C 相近，但功能上有：内存安全，GC（垃圾回收），结构形态及 CSP-style 并发计算。 environment: | -- Gitee