Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions docker/debian-dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,38 @@ ARG CODE_PATH
ENV DEBIAN_FRONTEND=noninteractive
ENV ENV_INST_LUADIR=/usr/local/apisix

COPY ${CODE_PATH} /apisix

WORKDIR /apisix

ARG INSTALL_BROTLI=./install-brotli.sh

RUN set -x \
&& apt-get -y update --fix-missing \
&& apt-get install -y \
make \
git \
sudo \
libyaml-dev \
&& ls -al \
&& make deps \
cmake \
wget \
unzip

COPY ${CODE_PATH}/Makefile ${CODE_PATH}/apisix-master-0.rockspec ${CODE_PATH}/.requirements /apisix/
COPY ${CODE_PATH}/utils/install-dependencies.sh /apisix/utils/

RUN make deps \
&& mkdir -p ${ENV_INST_LUADIR} \
&& cp -r deps ${ENV_INST_LUADIR} \
&& make install
&& cp -r deps ${ENV_INST_LUADIR}

COPY ${INSTALL_BROTLI} /install-brotli.sh
RUN chmod +x /install-brotli.sh && /install-brotli.sh

COPY ${CODE_PATH} /apisix

RUN make install

FROM debian:bullseye-slim

ARG ENTRYPOINT_PATH=./docker-entrypoint.sh
ARG INSTALL_BROTLI=./install-brotli.sh
ARG CHECK_STANDALONE_CONFIG=./check_standalone_config.sh

# Install the runtime libyaml package
Expand All @@ -54,11 +65,12 @@ RUN apt-get -y update --fix-missing \
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 --from=build /usr/local/brotli /usr/local/brotli
COPY --chown=nobody:root ui/ /usr/local/apisix/ui/

COPY ${INSTALL_BROTLI} /install-brotli.sh
RUN chmod +x /install-brotli.sh \
&& cd / && ./install-brotli.sh && rm -rf /install-brotli.sh
RUN echo /usr/local/brotli/lib | tee /etc/ld.so.conf.d/brotli.conf \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please note the handling of the lib64 directory in the original install-brotli.sh script. https://github.com/apache/apisix/blob/master/docker/debian-dev/install-brotli.sh#L28-L32

&& ldconfig \
&& ln -sf /usr/local/brotli/bin/brotli /usr/bin/brotli

ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin

Expand Down