[trafficserver-ingress-controller] branch master updated: Remove dependency on lua 5.1.4 for compiling luasocket (#102)

[ki...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kichan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new 93e0236  Remove dependency on lua 5.1.4 for compiling luasocket (#102)
93e0236 is described below

commit 93e0236ff6b6cbb20b86c275c855a1662bae6de4
Author: Kit Chan <ki...@apache.org>
AuthorDate: Fri Feb 4 09:36:26 2022 -0800

    Remove dependency on lua 5.1.4 for compiling luasocket (#102)
    
    * Remove dependency on lua 5.1.4 for compiling luasocket
    
    * Create directory for lua include files
---
 Dockerfile | 9 ++-------
 README.md  | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bd92f74..4c084d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,19 +49,14 @@ COPY ["./config/logging.yaml", "/opt/ats/etc/trafficserver/logging.yaml"]
 RUN sed -i "s/TM_DAEMON_ARGS=\"\"/TM_DAEMON_ARGS=\" --bind_stdout \/opt\/ats\/var\/log\/trafficserver\/traffic.out --bind_stderr \/opt\/ats\/var\/log\/trafficserver\/traffic.out \"/" /opt/ats/bin/trafficserver
 RUN sed -i "s/TS_DAEMON_ARGS=\"\"/TS_DAEMON_ARGS=\" --bind_stdout \/opt\/ats\/var\/log\/trafficserver\/traffic.out --bind_stderr \/opt\/ats\/var\/log\/trafficserver\/traffic.out \"/" /opt/ats/bin/trafficserver
 
-# Installing lua 5.1.4 and provide header files to compile luasocket 
-RUN curl -R -O http://www.lua.org/ftp/lua-5.1.4.tar.gz \
-    && tar zxf lua-5.1.4.tar.gz \
-    && cd lua-5.1.4 \
-    && make linux test \
-    && make linux install
-
 # luasocket
 RUN wget https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz \
   && tar zxf v3.0-rc1.tar.gz \
   && cd luasocket-3.0-rc1 \
   && sed -i "s/LDFLAGS_linux=-O -shared -fpic -o/LDFLAGS_linux=-O -shared -fpic -L\/usr\/lib -lluajit-5.1 -o/" src/makefile \
   && ln -sf /usr/lib/libluajit-5.1.so.2.1.0 /usr/lib/libluajit-5.1.so \
+  && mkdir -p /usr/include/lua \
+  && ln -sf /usr/include/luajit-2.1 /usr/include/lua/5.1 \
   && make \
   && make install-unix prefix=/opt/ats
 
diff --git a/README.md b/README.md
index 3b48077..c680c80 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ ATS Kubernetes Ingress Controller
 ## Versions of Software Used
 - Alpine Linux 3.14.3
 - Apache Traffic Server 9.1.1
-- LuaJIT 2.0.4 / Lua 5.1.4
+- LuaJIT 2.0.4
 - Go 1.16.13
 - Other Packages
   - luasocket 3.0rc1