You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/03/16 05:34:38 UTC
[skywalking] branch master updated: Improvement lua e2e case (#6553)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new c2fa8ba Improvement lua e2e case (#6553)
c2fa8ba is described below
commit c2fa8baf5c7dee1820a668c9ae3f5f949f619a2d
Author: Daming <zt...@foxmail.com>
AuthorDate: Tue Mar 16 13:34:17 2021 +0800
Improvement lua e2e case (#6553)
---
test/e2e/e2e-test/docker/lua/Dockerfile.nginx | 5 ++++-
test/e2e/e2e-test/docker/lua/nginx.conf | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/test/e2e/e2e-test/docker/lua/Dockerfile.nginx b/test/e2e/e2e-test/docker/lua/Dockerfile.nginx
index c2b0a9e..78b49aa 100644
--- a/test/e2e/e2e-test/docker/lua/Dockerfile.nginx
+++ b/test/e2e/e2e-test/docker/lua/Dockerfile.nginx
@@ -15,7 +15,7 @@
FROM openresty/openresty:1.17.8.2-5-alpine-fat
-ENV COMMIT_HASH=c19c5cb2aa00b496288dc115a084a68a143f5f11
+ENV COMMIT_HASH=c3cee4841798a147d83b96a10914d4ac0e11d0aa
WORKDIR /usr/share/skywalking-nginx-lua
@@ -24,3 +24,6 @@ ADD https://github.com/apache/skywalking-nginx-lua/archive/${COMMIT_HASH}.tar.gz
RUN tar -xf ${COMMIT_HASH}.tar.gz --strip 1
RUN rm ${COMMIT_HASH}.tar.gz
+
+RUN luarocks make rockspec/skywalking-nginx-lua-master-0.rockspec
+
diff --git a/test/e2e/e2e-test/docker/lua/nginx.conf b/test/e2e/e2e-test/docker/lua/nginx.conf
index 59b0004..09d12f1 100644
--- a/test/e2e/e2e-test/docker/lua/nginx.conf
+++ b/test/e2e/e2e-test/docker/lua/nginx.conf
@@ -23,7 +23,7 @@ events {
http {
resolver local=on ipv6=off;
- lua_package_path "/usr/share/skywalking-nginx-lua/lib/?.lua;;";
+ # lua_package_path "/usr/local/openresty/luajit/share/lua/5.1/skywalking/?.lua;;";
# Buffer represents the register inform and the queue of the finished segment
lua_shared_dict tracing_buffer 100m;
@@ -61,4 +61,4 @@ http {
}
}
}
-}
\ No newline at end of file
+}