diff --git a/all-in-one/apisix-dashboard/Dockerfile b/all-in-one/apisix-dashboard/Dockerfile index a25a359b..c8badcbc 100644 --- a/all-in-one/apisix-dashboard/Dockerfile +++ b/all-in-one/apisix-dashboard/Dockerfile @@ -53,7 +53,6 @@ RUN set -x \ && mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \ && apk del .builddeps build-base make unzip - # Build etcd FROM alpine:3.13 AS etcd-stage diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile index db0e2be2..5de9d0d7 100644 --- a/all-in-one/apisix/Dockerfile +++ b/all-in-one/apisix/Dockerfile @@ -31,7 +31,8 @@ USER root 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/ + && mv etcd-${ETCD_VERSION}-linux-amd64/* /usr/bin/ \ + && rm /usr/local/openresty/bin/etcdctl WORKDIR /usr/local/apisix diff --git a/centos/Dockerfile b/centos/Dockerfile index 3d5c616f..e8784247 100644 --- a/centos/Dockerfile +++ b/centos/Dockerfile @@ -31,7 +31,8 @@ ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/ # forward request and error logs to docker log collector RUN ln -sf /dev/stdout /usr/local/apisix/logs/access.log \ - && ln -sf /dev/stderr /usr/local/apisix/logs/error.log + && ln -sf /dev/stderr /usr/local/apisix/logs/error.log \ + && rm /usr/local/openresty/bin/etcdctl EXPOSE 9080 9443 diff --git a/dashboard/Dockerfile.alpine b/dashboard/Dockerfile.alpine index b04d1ba3..2a220559 100644 --- a/dashboard/Dockerfile.alpine +++ b/dashboard/Dockerfile.alpine @@ -24,7 +24,8 @@ RUN set -x \ && apk add --no-cache --virtual .builddeps git \ && git clone https://github.com/apache/apisix-dashboard.git -b ${APISIX_DASHBOARD_TAG} /usr/local/apisix-dashboard \ && cd /usr/local/apisix-dashboard && git clean -Xdf \ - && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash + && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash \ + && rm /usr/local/openresty/bin/etcdctl FROM --platform=$BUILDPLATFORM golang:1.19 as api-builder diff --git a/dashboard/Dockerfile.centos b/dashboard/Dockerfile.centos index 24d14635..a3710ef2 100644 --- a/dashboard/Dockerfile.centos +++ b/dashboard/Dockerfile.centos @@ -24,7 +24,8 @@ RUN set -x \ && apk add --no-cache --virtual .builddeps git \ && git clone https://github.com/apache/apisix-dashboard.git -b ${APISIX_DASHBOARD_TAG} /usr/local/apisix-dashboard \ && cd /usr/local/apisix-dashboard && git clean -Xdf \ - && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash + && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash \ + && rm /usr/local/openresty/bin/etcdctl FROM --platform=$BUILDPLATFORM golang:1.19 as api-builder diff --git a/debian/Dockerfile b/debian/Dockerfile index 67b7c061..21397de2 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -41,6 +41,7 @@ RUN set -ex; \ && apt install -y apisix=${APISIX_VERSION}-0 \ && apt-get purge -y --auto-remove \ && rm -f /etc/apt/sources.list.d/openresty.list /etc/apt/sources.list.d/apisix.list \ + && rm /usr/local/openresty/bin/etcdctl \ && openresty -V \ && apisix version diff --git a/redhat/Dockerfile b/redhat/Dockerfile index a8b5c79d..8645ca40 100644 --- a/redhat/Dockerfile +++ b/redhat/Dockerfile @@ -33,7 +33,8 @@ ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/ # forward request and error logs to docker log collector RUN ln -sf /dev/stdout /usr/local/apisix/logs/access.log \ - && ln -sf /dev/stderr /usr/local/apisix/logs/error.log + && ln -sf /dev/stderr /usr/local/apisix/logs/error.log \ + && rm /usr/local/openresty/bin/etcdctl EXPOSE 9080 9443