Lua/* remove TE dependencies [ci lang-only Lua] (#3517)

frameworks/Lua/lapis/lapis.dockerfile

@@ -1,12 +1,61 @@
-FROM techempower/openresty-server:0.1
+FROM ubuntu:16.04
 
-COPY ./ ./
+ENV LUA_VERSION="5.1"
+ENV LUA_MICRO="5"
+
+RUN apt update -yqq && \
+    apt install -yqq libreadline-dev lib32ncurses5-dev wget curl build-essential \
+      libpq-dev libpcre3 libpcre3-dev unzip git
+
+RUN wget -q https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
+RUN tar xf $LUA_VERSION.$LUA_MICRO.tar.gz
+
+ENV LUA_HOME=/lua-$LUA_VERSION.$LUA_MICRO
+
+RUN cd $LUA_HOME && \
+    cp src/luaconf.h.orig src/luaconf.h && \
+    make linux && \
+    cd src && \
+    mkdir ../bin ../include ../lib && \
+    install -p -m 0755 lua luac ../bin && \
+    install -p -m 0644 lua.h luaconf.h lualib.h lauxlib.h ../include && \
+    install -p -m 0644 liblua.a ../lib
+
+ENV LUA=/lua${LUA_VERSION}.${LUA_MICRO}
+ENV PATH=${LUA_HOME}/bin:${PATH}
+ENV LUA_PATH="./?.lua;./?.lc;$LUA_HOME/share/lua/5.1/?/init.lua;$LUA_HOME/share/lua/5.1/?.lua;$LUA_HOME/lib/lua/5.1/?/init.lua;$LUA_HOME/lib/lua/5.1/?.lua"
+ENV LUA_CPATH="./?.lua;./?.lc;$LUA_HOME/share/lua/5.1/?/init.so;$LUA_HOME/share/lua/5.1/?.so;$LUA_HOME/lib/lua/5.1/?/init.so;$LUA_HOME/lib/lua/5.1/?.so"
+ENV LUAROCKS_VERSION="2.2.1"
+ENV LUAROCKS=/luarocks-$LUAROCKS_VERSION
+
+RUN wget -q http://luarocks.org/releases/luarocks-$LUAROCKS_VERSION.tar.gz
+RUN tar xf luarocks-$LUAROCKS_VERSION.tar.gz
+
+RUN cd $LUAROCKS && \
+    ./configure --prefix=$LUA_HOME --with-lua=$LUA_HOME && \
+    make --quiet bootstrap
+
+ENV OPENRESTY_VERSION="1.11.2.1"
+ENV OPENRESTY=/openresty
+ENV OPENRESTY_HOME=$OPENRESTY-$OPENRESTY_VERSION
+
+RUN wget http://openresty.org/download/openresty-$OPENRESTY_VERSION.tar.gz
+RUN tar xf openresty-$OPENRESTY_VERSION.tar.gz
+
+RUN cd openresty-$OPENRESTY_VERSION && \
+    ./configure --with-http_postgres_module --prefix=$OPENRESTY_HOME --with-luajit-xcflags="-DLUAJIT_NUMMODE=2 -O3" --with-cc-opt="-O3" -j4 && \
+    make -j4 --quiet && \
+    make --quiet install
+
+ENV OPENRESTY_HOME=${OPENRESTY_HOME}
+ENV PATH=${OPENRESTY_HOME}/nginx/sbin:${PATH}
+
+ADD ./ /lapis
+WORKDIR /lapis
 
 RUN luarocks install lua-resty-template
 RUN luarocks install lapis
 
-# RUN DBHOST=`getent hosts tfb-database | awk '{ print $1 }'` sed -i 's|DBHOSTNAME|$DBHOST|g' nginx.conf
-
 CMD export DBIP=`getent hosts tfb-database | awk '{ print $1 }'` && \
     sed -i "s|DBHOSTNAME|$DBIP|g" nginx.conf && \
     sed -i "s|DBHOSTNAME|$DBIP|g" config.moon && \

frameworks/Lua/lapis/nginx.conf

@@ -3,7 +3,6 @@
     error_log stderr notice;
     #error_log /tmp/test.log error;
     env LAPIS_ENVIRONMENT;
-    env DBHOST;
     daemon off;
 
     events {

frameworks/Lua/octopus/octopus.dockerfile

@@ -1,4 +1,30 @@
-FROM techempower/lua:0.1
+FROM ubuntu:16.04
+
+ENV LUA_VERSION="5.1"
+ENV LUA_MICRO="5"
+
+RUN apt update -yqq && \
+    apt install -yqq libreadline-dev lib32ncurses5-dev wget curl build-essential \
+      libpq-dev libpcre3 libpcre3-dev unzip git
+
+RUN wget https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
+RUN tar xf $LUA_VERSION.$LUA_MICRO.tar.gz
+
+ENV LUA_HOME=/lua-$LUA_VERSION.$LUA_MICRO
+
+RUN cd $LUA_HOME && \
+    cp src/luaconf.h.orig src/luaconf.h && \
+    make linux && \
+    cd src && \
+    mkdir ../bin ../include ../lib && \
+    install -p -m 0755 lua luac ../bin && \
+    install -p -m 0644 lua.h luaconf.h lualib.h lauxlib.h ../include && \
+    install -p -m 0644 liblua.a ../lib
+
+ENV LUA=/lua${LUA_VERSION}.${LUA_MICRO}
+ENV PATH=${LUA_HOME}/bin:${PATH}
+ENV LUA_PATH="./?.lua;./?.lc;$LUA_HOME/share/lua/5.1/?/init.lua;$LUA_HOME/share/lua/5.1/?.lua;$LUA_HOME/lib/lua/5.1/?/init.lua;$LUA_HOME/lib/lua/5.1/?.lua"
+ENV LUA_CPATH="./?.lua;./?.lc;$LUA_HOME/share/lua/5.1/?/init.so;$LUA_HOME/share/lua/5.1/?.so;$LUA_HOME/lib/lua/5.1/?/init.so;$LUA_HOME/lib/lua/5.1/?.so"
 
 WORKDIR /octo
 

frameworks/Lua/openresty/openresty.dockerfile

@@ -1,5 +1,54 @@
-FROM techempower/openresty-server:0.1
+FROM ubuntu:16.04
 
+ENV LUA_VERSION="5.1"
+ENV LUA_MICRO="5"
+
+RUN apt update -yqq && \
+    apt install -yqq libreadline-dev lib32ncurses5-dev wget curl build-essential \
+      libpq-dev libpcre3 libpcre3-dev unzip git
+
+RUN wget -q https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
+RUN tar xf $LUA_VERSION.$LUA_MICRO.tar.gz
+
+ENV LUA_HOME=/lua-$LUA_VERSION.$LUA_MICRO
+
+RUN cd $LUA_HOME && \
+    cp src/luaconf.h.orig src/luaconf.h && \
+    make linux && \
+    cd src && \
+    mkdir ../bin ../include ../lib && \
+    install -p -m 0755 lua luac ../bin && \
+    install -p -m 0644 lua.h luaconf.h lualib.h lauxlib.h ../include && \
+    install -p -m 0644 liblua.a ../lib
+
+ENV LUA=/lua${LUA_VERSION}.${LUA_MICRO}
+ENV PATH=${LUA_HOME}/bin:${PATH}
+ENV LUA_PATH="./?.lua;./?.lc;$LUA_HOME/share/lua/5.1/?/init.lua;$LUA_HOME/share/lua/5.1/?.lua;$LUA_HOME/lib/lua/5.1/?/init.lua;$LUA_HOME/lib/lua/5.1/?.lua"
+ENV LUA_CPATH="./?.lua;./?.lc;$LUA_HOME/share/lua/5.1/?/init.so;$LUA_HOME/share/lua/5.1/?.so;$LUA_HOME/lib/lua/5.1/?/init.so;$LUA_HOME/lib/lua/5.1/?.so"
+ENV LUAROCKS_VERSION="2.2.1"
+ENV LUAROCKS=/luarocks-$LUAROCKS_VERSION
+
+RUN wget -q http://luarocks.org/releases/luarocks-$LUAROCKS_VERSION.tar.gz
+RUN tar xf luarocks-$LUAROCKS_VERSION.tar.gz
+
+RUN cd $LUAROCKS && \
+    ./configure --prefix=$LUA_HOME --with-lua=$LUA_HOME && \
+    make --quiet bootstrap
+
+ENV OPENRESTY_VERSION="1.11.2.1"
+ENV OPENRESTY=/openresty
+ENV OPENRESTY_HOME=$OPENRESTY-$OPENRESTY_VERSION
+
+RUN wget http://openresty.org/download/openresty-$OPENRESTY_VERSION.tar.gz
+RUN tar xf openresty-$OPENRESTY_VERSION.tar.gz
+
+RUN cd openresty-$OPENRESTY_VERSION && \
+    ./configure --with-http_postgres_module --prefix=$OPENRESTY_HOME --with-luajit-xcflags="-DLUAJIT_NUMMODE=2 -O3" --with-cc-opt="-O3" -j4 && \
+    make -j4 --quiet && \
+    make --quiet install
+
+ENV OPENRESTY_HOME=${OPENRESTY_HOME}
+ENV PATH=${OPENRESTY_HOME}/nginx/sbin:${PATH}
 ADD ./nginx.conf /openresty/
 ADD ./app.lua /openresty/
 

toolset/setup/docker/systools/luarocks.dockerfile

@@ -1,11 +0,0 @@
-FROM techempower/lua:0.1
-
-ENV LUAROCKS_VERSION="2.2.1"
-ENV LUAROCKS=/luarocks-$LUAROCKS_VERSION
-
-RUN wget http://luarocks.org/releases/luarocks-$LUAROCKS_VERSION.tar.gz
-RUN tar xf luarocks-$LUAROCKS_VERSION.tar.gz
-
-RUN cd $LUAROCKS && \
-    ./configure --prefix=$LUA_HOME --with-lua=$LUA_HOME && \
-    make --quiet bootstrap

toolset/setup/docker/webservers/openresty-server.dockerfile

@@ -1,18 +0,0 @@
-FROM techempower/luarocks:0.1
-
-RUN apt install -yqq libpq-dev libpcre3 libpcre3-dev
-
-ENV OPENRESTY_VERSION="1.11.2.1"
-ENV OPENRESTY=/openresty
-ENV OPENRESTY_HOME=$OPENRESTY-$OPENRESTY_VERSION
-
-RUN wget http://openresty.org/download/openresty-$OPENRESTY_VERSION.tar.gz
-RUN tar xf openresty-$OPENRESTY_VERSION.tar.gz
-
-RUN cd openresty-$OPENRESTY_VERSION && \
-    ./configure --with-http_postgres_module --prefix=$OPENRESTY_HOME --with-luajit-xcflags="-DLUAJIT_NUMMODE=2 -O3" --with-cc-opt="-O3" -j4 && \
-    make -j4 --quiet && \
-    make --quiet install
-
-ENV OPENRESTY_HOME=${OPENRESTY_HOME}
-ENV PATH=${OPENRESTY_HOME}/nginx/sbin:${PATH}