diff --git a/Makefile b/Makefile index 4cccf88f..ff237545 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ define build_image_dev $(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-debian-dev \ --build-arg CODE_PATH=$(1) \ --build-arg ENTRYPOINT_PATH=debian-dev/docker-entrypoint.sh \ + --build-arg INSTALL_BROTLI=debian-dev/install-brotli.sh \ -f ./debian-dev/Dockerfile.local . endef diff --git a/debian-dev/Dockerfile b/debian-dev/Dockerfile index 0a53643f..5cd9c3f5 100644 --- a/debian-dev/Dockerfile +++ b/debian-dev/Dockerfile @@ -53,7 +53,7 @@ RUN apt-get -y update --fix-missing \ libldap2-dev \ && apt-get remove --purge --auto-remove -y -COPY install-brotli.sh /install-brotli.sh +COPY ./install-brotli.sh /install-brotli.sh RUN chmod +x /install-brotli.sh \ && cd / && ./install-brotli.sh && rm -rf /install-brotli.sh diff --git a/debian-dev/Dockerfile.local b/debian-dev/Dockerfile.local index c44511b5..f3ba829c 100644 --- a/debian-dev/Dockerfile.local +++ b/debian-dev/Dockerfile.local @@ -44,12 +44,13 @@ RUN set -x \ FROM debian:bullseye-slim ARG ENTRYPOINT_PATH=./docker-entrypoint.sh +ARG INSTALL_BROTLI=./install-brotli.sh COPY --from=build /usr/local/apisix /usr/local/apisix COPY --from=build /usr/local/openresty /usr/local/openresty COPY --from=build /usr/bin/apisix /usr/bin/apisix -COPY install-brotli.sh /install-brotli.sh +COPY ${INSTALL_BROTLI} /install-brotli.sh RUN chmod +x /install-brotli.sh \ && cd / && ./install-brotli.sh && rm -rf /install-brotli.sh diff --git a/debian/Dockerfile b/debian/Dockerfile index 8416c12e..818e28a1 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -41,7 +41,7 @@ RUN set -ex; \ && openresty -V \ && apisix version -COPY install-brotli.sh /install-brotli.sh +COPY ./install-brotli.sh /install-brotli.sh RUN chmod +x /install-brotli.sh \ && cd / && ./install-brotli.sh && rm -rf /install-brotli.sh