You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2022/01/17 11:52:21 UTC
[apisix-docker] branch master updated: chore: update apisix-base to 1.19.9.1.1 (#271)
This is an automated email from the ASF dual-hosted git repository.
spacewander 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 e7c3ae2 chore: update apisix-base to 1.19.9.1.1 (#271)
e7c3ae2 is described below
commit e7c3ae2f2b0cd8406e9d9af94fe3f0f10536f475
Author: Zeping Bai <bz...@apache.org>
AuthorDate: Mon Jan 17 19:52:16 2022 +0800
chore: update apisix-base to 1.19.9.1.1 (#271)
---
alpine-dev/Dockerfile | 46 +++++++++++++++++++---------------------------
alpine/Dockerfile | 48 ++++++++++++++++++++----------------------------
2 files changed, 39 insertions(+), 55 deletions(-)
diff --git a/alpine-dev/Dockerfile b/alpine-dev/Dockerfile
index 2be5851..ebe61a4 100644
--- a/alpine-dev/Dockerfile
+++ b/alpine-dev/Dockerfile
@@ -23,39 +23,31 @@ ARG ENABLE_PROXY
RUN set -x \
&& (test "${ENABLE_PROXY}" != "true" || /bin/sed -i 's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g' /etc/apk/repositories) \
&& apk add --no-cache --virtual .builddeps \
- automake \
- autoconf \
- libtool \
- pkgconfig \
- cmake \
- git \
- pcre \
- pcre-dev \
- openldap-dev \
- && git config --global url.https://github.com/.insteadOf git://github.com/ \
+ build-base \
+ automake \
+ autoconf \
+ make \
+ libtool \
+ pkgconfig \
+ cmake \
+ unzip \
+ curl \
+ openssl \
+ git \
+ pcre \
+ pcre-dev \
+ openldap-dev \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-master-0.rockspec --tree=/usr/local/apisix/deps \
&& cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/master-0/bin/apisix /usr/bin/ \
&& mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \
- && apk del .builddeps build-base make unzip
-
-FROM alpine:3.13 AS last-stage
-
-ARG ENABLE_PROXY
-# add runtime for Apache APISIX
-RUN set -x \
- && (test "${ENABLE_PROXY}" != "true" || /bin/sed -i 's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g' /etc/apk/repositories) \
- && apk add --no-cache bash libstdc++ curl tzdata openldap-dev
+ && apk del .builddeps \
+ && apk add --no-cache bash libstdc++ curl tzdata \
+ # forward request and error logs to docker log collector
+ && ln -sf /dev/stdout /usr/local/apisix/logs/access.log \
+ && ln -sf /dev/stderr /usr/local/apisix/logs/error.log
WORKDIR /usr/local/apisix
-COPY --from=production-stage /usr/local/openresty/ /usr/local/openresty/
-COPY --from=production-stage /usr/local/apisix/ /usr/local/apisix/
-COPY --from=production-stage /usr/bin/apisix /usr/bin/apisix
-
-# 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
-
ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin
EXPOSE 9080 9443
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index f33eeb4..5a93805 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -18,7 +18,7 @@
ARG ENABLE_PROXY=false
# Build Apache APISIX
-FROM api7/apisix-base:1.19.3.2.2 AS production-stage
+FROM api7/apisix-base:1.19.9.1.1
ARG APISIX_VERSION=2.11.0
LABEL apisix_version="${APISIX_VERSION}"
@@ -27,40 +27,32 @@ ARG ENABLE_PROXY
RUN set -x \
&& (test "${ENABLE_PROXY}" != "true" || /bin/sed -i 's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g' /etc/apk/repositories) \
&& apk add --no-cache --virtual .builddeps \
- automake \
- autoconf \
- libtool \
- pkgconfig \
- cmake \
- git \
- pcre \
- pcre-dev \
- openldap-dev \
- && git config --global url.https://github.com/.insteadOf git://github.com/ \
+ build-base \
+ automake \
+ autoconf \
+ make \
+ libtool \
+ pkgconfig \
+ cmake \
+ unzip \
+ curl \
+ openssl \
+ git \
+ pcre \
+ pcre-dev \
+ openldap-dev \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \
&& cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \
&& (function ver_lt { [ "$1" = "$2" ] && return 1 || [ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]; }; if [ "$APISIX_VERSION" = "master" ] || ver_lt 2.2.0 $APISIX_VERSION; then echo 'use shell ';else bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path'; sed -i "1s@.*@$bin@" /usr/bin/apisix ; fi;) \
&& mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \
- && apk del .builddeps build-base make unzip
-
-FROM alpine:3.13 AS last-stage
-
-ARG ENABLE_PROXY
-# add runtime for Apache APISIX
-RUN set -x \
- && (test "${ENABLE_PROXY}" != "true" || /bin/sed -i 's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g' /etc/apk/repositories) \
- && apk add --no-cache bash libstdc++ curl tzdata openldap-dev
+ && apk del .builddeps \
+ && apk add --no-cache bash libstdc++ curl tzdata \
+ # forward request and error logs to docker log collector
+ && ln -sf /dev/stdout /usr/local/apisix/logs/access.log \
+ && ln -sf /dev/stderr /usr/local/apisix/logs/error.log
WORKDIR /usr/local/apisix
-COPY --from=production-stage /usr/local/openresty/ /usr/local/openresty/
-COPY --from=production-stage /usr/local/apisix/ /usr/local/apisix/
-COPY --from=production-stage /usr/bin/apisix /usr/bin/apisix
-
-# 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
-
ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin
EXPOSE 9080 9443