[apisix-docker] branch master updated: fix: keep both curl and wget in apisix image (#427)

[soulbird]

This is an automated email from the ASF dual-hosted git repository.

soulbird pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git


The following commit(s) were added to refs/heads/master by this push:
     new 666df56  fix: keep both curl and wget in apisix image (#427)
666df56 is described below

commit 666df564c2c6198054e6428a1fc956a40dd8c01a
Author: Baoyuan <baoyuan....@gmail.com>
AuthorDate: Wed Feb 8 17:31:24 2023 +0800

    fix: keep both curl and wget in apisix image (#427)
---
 all-in-one/apisix/Dockerfile | 2 +-
 debian/Dockerfile            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile
index 054c9d4..db0e2be 100644
--- a/all-in-one/apisix/Dockerfile
+++ b/all-in-one/apisix/Dockerfile
@@ -29,7 +29,7 @@ WORKDIR /tmp
 
 USER root
 
-RUN curl -sSL 
https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz
 -o etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
+RUN wget 
https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz
 \
     && tar -zxvf etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
     && mv etcd-${ETCD_VERSION}-linux-amd64/* /usr/bin/
 
diff --git a/debian/Dockerfile b/debian/Dockerfile
index aee58ff..c0c1f72 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -22,18 +22,18 @@ ARG APISIX_VERSION=3.1.0
 RUN set -ex; \
     arch=$(dpkg --print-architecture); \
     apt update; \
-    apt-get -y install --no-install-recommends gnupg ca-certificates curl; \
+    apt-get -y install --no-install-recommends wget gnupg ca-certificates 
curl; \
     codename=`grep -Po 'VERSION="[0-9]+ \(\K[^)]+' /etc/os-release`; \
-    curl -sSL https://openresty.org/package/pubkey.gpg | apt-key add -; \
+    wget -O - https://openresty.org/package/pubkey.gpg | apt-key add -; \
     case "${arch}" in \
       amd64) \
         echo "deb http://openresty.org/package/debian $codename openresty" | 
tee /etc/apt/sources.list.d/openresty.list \
-        && curl -sSL http://repos.apiseven.com/pubkey.gpg | apt-key add - \
+        && wget -O - http://repos.apiseven.com/pubkey.gpg | apt-key add - \
         && echo "deb http://repos.apiseven.com/packages/debian $codename main" 
| tee /etc/apt/sources.list.d/apisix.list \
         ;; \
       arm64) \
         echo "deb http://openresty.org/package/arm64/debian $codename 
openresty" | tee /etc/apt/sources.list.d/openresty.list \
-        && curl -sSL http://repos.apiseven.com/pubkey.gpg | apt-key add - \
+        && wget -O - http://repos.apiseven.com/pubkey.gpg | apt-key add - \
         && echo "deb http://repos.apiseven.com/packages/arm64/debian $codename 
main" | tee /etc/apt/sources.list.d/apisix.list \
         ;; \
     esac; \