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 a4b6b099af3d1f2121a02914b51db6265c4f791a..1f84dad3f0c581577eb40dde5609fe482f9d0d6f 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\342\200\216/Dockerfile" similarity index 100% rename from bind9/9.21.2/22.03-lts-sp1/Dockerfile rename to "bind9/9.21.2/22.03-lts-sp1\342\200\216/Dockerfile" diff --git a/bind9/9.21.2/22.03-lts-sp1/named "b/bind9/9.21.2/22.03-lts-sp1\342\200\216/named" similarity index 100% rename from bind9/9.21.2/22.03-lts-sp1/named rename to "bind9/9.21.2/22.03-lts-sp1\342\200\216/named" diff --git a/bind9/9.21.2/22.03-lts-sp1/named.conf "b/bind9/9.21.2/22.03-lts-sp1\342\200\216/named.conf" similarity index 100% rename from bind9/9.21.2/22.03-lts-sp1/named.conf rename to "bind9/9.21.2/22.03-lts-sp1\342\200\216/named.conf" diff --git a/bind9/meta.yml b/bind9/meta.yml index 0ecb75e3998976625609c829a955f500c66191d7..6e0c9eedfb5f08a13ea5d3120e5539aff322411f 100644 --- a/bind9/meta.yml +++ b/bind9/meta.yml @@ -1,10 +1,10 @@ 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-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-oe2403lts: - path: bind9/9.21.2/24.03-lts/Dockerfile \ No newline at end of file +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 121e6c6d8a7010a9b4fd23f03da7ba19a26760e2..f46fc7748cf37ea9ac29ce0d2f6d4dd012223bde 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: | diff --git a/kafka/3.8.0/22.03-lts-sp1/Dockerfile b/kafka/3.8.0/22.03-lts-sp1/Dockerfile index 6b73036e3c6cf84a078511858eb5fe797bc763f0..f14512f5f0fc53a77570b6a536166310a85802c6 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 11d6fe80928803bcfc2007615718ae49e76f5e1a..9e7f34363f6f843e07f820214cd28f544ffa4f97 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 8cc32310b7eb82a2c085549095ac3991728ad42a..01f3e1ac220d10c114dbc8dd9430293cae3e9ef0 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 547d5553c0a0665203d422375c7997f9bb561737..cb9a9ee197b495d3407b5f974bf980c96a744e9d 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 66dee35d13325895f26a705efd750b59059abec1..64073ac41cf5b99e1729eb70729bc2cde25455c6 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 cebd423fb757f80d5cd882c29f6c1dd3054c82d4..2790f511fe49c44b6d5668a68740aab3b97e3db4 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 42b49275c51d93af0bfc13cb3fbe78d9ee43460e..23e15df53ad4e935f748896a8806ff56445b6625 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 f1f1be8abcf0ca19cf79d4e4e90b518022457fab..c62b6ecca9651fc625504a16088088c65bd1c275 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 e1848157e9b66b12e58dfdbb1832236071632c02..665dd5748954b915fb2f34c1825cd68beedec857 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 ee117800d33fcf4f14e3d88f3422ad6f0f3532e3..40b1de72bcaf8d954ee48b83e780c8fb466162c5 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 39884c52c50e2aeff6cf97ef6c22f20268a1ab88..f5a25c84600b8c05e5172f76c860b718816c1545 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 00d4569353bf8b181bd0f9d9f953e3abfadbcc7f..c21e033090bcc32d6b0d2e8080ec576fd862f93b 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 7bcfe5a52c2a3fd009f85043eedd43e5ceadefde..0dde59305b497bd45db6ca69b19f0128287205b3 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 ae0482d490cc7d434cf9cf754e896a5c0b99c386..f2ee2168c2323b55e8659eff8afca2d2e4548448 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 6cdd58e0e6a431a74c82a314c572816d578f85de..085373c59e25483e6e351a12e5f63352d776ed6a 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 57ed9032cdad8ba0072fcdbabae20d136953dafd..2561c0f1d3621fac1b920cd8377057aa9b1230df 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 1b8211cf3775c51c55fdb4595e630e7a7b2b3dc1..927fc54582e5b7c9a05305cb32d14d61993e0214 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