This is an automated email from the ASF dual-hosted git repository.
kvn 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 5b07a0c fix: add env variable of openssl libdir and incdir in
dockerfile (#123)
5b07a0c is described below
commit 5b07a0c9ffdce8e2308c9cd02e3697ffa081ed9f
Author: fukiki <[email protected]>
AuthorDate: Mon Feb 1 21:35:08 2021 +0800
fix: add env variable of openssl libdir and incdir in dockerfile (#123)
Signed-off-by: fukiki <[email protected]>
---
all-in-one/apisix-dashboard/Dockerfile | 2 ++
all-in-one/apisix/Dockerfile | 2 ++
alpine-dev/Dockerfile | 2 ++
alpine/Dockerfile | 2 ++
4 files changed, 8 insertions(+)
diff --git a/all-in-one/apisix-dashboard/Dockerfile
b/all-in-one/apisix-dashboard/Dockerfile
index 6c1c166..3b7d0db 100644
--- a/all-in-one/apisix-dashboard/Dockerfile
+++ b/all-in-one/apisix-dashboard/Dockerfile
@@ -19,6 +19,8 @@ RUN set -x \
pkgconfig \
cmake \
git \
+ && 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/ \
&& bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path =
"/usr/local/apisix/?.lua;" .. package.path' \
diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile
index 977242f..fb694f8 100644
--- a/all-in-one/apisix/Dockerfile
+++ b/all-in-one/apisix/Dockerfile
@@ -19,6 +19,8 @@ RUN set -x \
pkgconfig \
cmake \
git \
+ && 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/ \
&& bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path =
"/usr/local/apisix/?.lua;" .. package.path' \
diff --git a/alpine-dev/Dockerfile b/alpine-dev/Dockerfile
index 483b68d..eb62993 100644
--- a/alpine-dev/Dockerfile
+++ b/alpine-dev/Dockerfile
@@ -12,6 +12,8 @@ RUN set -x \
pkgconfig \
cmake \
git \
+ && 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/ \
&& bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path =
"/usr/local/apisix/?.lua;" .. package.path' \
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 07af102..7218685 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -15,6 +15,8 @@ RUN set -x \
pkgconfig \
cmake \
git \
+ && 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/ \
&& bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path =
"/usr/local/apisix/?.lua;" .. package.path' \