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 2021/11/03 13:40:19 UTC
[apisix-docker] branch master updated: feat: replace openresty with
apisix-base (#242)
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 bea3d88 feat: replace openresty with apisix-base (#242)
bea3d88 is described below
commit bea3d88bd206241cd2e3077007f7c125c58da899
Author: Xunzhuo <mi...@gmail.com>
AuthorDate: Wed Nov 3 21:38:55 2021 +0800
feat: replace openresty with apisix-base (#242)
---
all-in-one/apisix/Dockerfile | 5 +----
alpine-dev/Dockerfile | 5 +----
alpine-local/Dockerfile | 2 +-
alpine/Dockerfile | 6 ++----
4 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile
index cc8939b..6ea600d 100644
--- a/all-in-one/apisix/Dockerfile
+++ b/all-in-one/apisix/Dockerfile
@@ -3,7 +3,7 @@ ARG APISIX_VERSION=master
ARG ETCD_VERSION=v3.4.14
# Build Apache APISIX
-FROM openresty/openresty:1.19.3.1-alpine-fat AS production-stage
+FROM api7/apisix-base:1.19.3.2.1 AS production-stage
ARG APISIX_VERSION
LABEL apisix_version="${APISIX_VERSION}"
@@ -22,9 +22,6 @@ RUN set -x \
pcre \
pcre-dev \
openldap-dev \
- && mkdir ~/.luarocks \
- && luarocks config variables.OPENSSL_LIBDIR /usr/local/openresty/openssl/lib \
- && luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
&& 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/ \
&& (if [ "$APISIX_VERSION" = "master" ] || [ "$APISIX_VERSION" \> "2.2" ]; 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;) \
diff --git a/alpine-dev/Dockerfile b/alpine-dev/Dockerfile
index f4dd1a2..c63e499 100644
--- a/alpine-dev/Dockerfile
+++ b/alpine-dev/Dockerfile
@@ -1,6 +1,6 @@
ARG ENABLE_PROXY=false
-FROM openresty/openresty:1.19.3.1-alpine-fat AS production-stage
+FROM api7/apisix-base:1.19.3.2.1 AS production-stage
ARG ENABLE_PROXY
RUN set -x \
@@ -15,9 +15,6 @@ RUN set -x \
pcre \
pcre-dev \
openldap-dev \
- && mkdir ~/.luarocks \
- && luarocks config variables.OPENSSL_LIBDIR /usr/local/openresty/openssl/lib \
- && luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
&& 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 \
diff --git a/alpine-local/Dockerfile b/alpine-local/Dockerfile
index 4aee426..bf5d750 100644
--- a/alpine-local/Dockerfile
+++ b/alpine-local/Dockerfile
@@ -1,6 +1,6 @@
ARG ENABLE_PROXY=false
-FROM openresty/openresty:1.19.3.1-alpine-fat AS production-stage
+FROM api7/apisix-base:1.19.3.2.1 AS production-stage
ARG ENABLE_PROXY
ARG APISIX_PATH
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index bbb36b2..785e56c 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -1,6 +1,7 @@
ARG ENABLE_PROXY=false
-FROM openresty/openresty:1.19.3.1-alpine-fat AS production-stage
+# Build Apache APISIX
+FROM api7/apisix-base:1.19.3.2.1 AS production-stage
ARG APISIX_VERSION=2.10.1
LABEL apisix_version="${APISIX_VERSION}"
@@ -18,9 +19,6 @@ RUN set -x \
pcre \
pcre-dev \
openldap-dev \
- && mkdir ~/.luarocks \
- && luarocks config variables.OPENSSL_LIBDIR /usr/local/openresty/openssl/lib \
- && luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
&& 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;) \