Docker lua (#3436)

* lua

* lua and the quieting

.travis.yml

@@ -113,8 +113,8 @@ env:
      - "TESTDIR=Kotlin/ktor"
      - "TESTDIR=Kotlin/pronghorn"
      - "TESTDIR=Lua/lapis"
-    # - "TESTDIR=Lua/octopus"
-    # - "TESTDIR=Lua/openresty"
+     - "TESTDIR=Lua/octopus"
+     - "TESTDIR=Lua/openresty"
      - "TESTDIR=Nim/jester"
      - "TESTDIR=Perl/dancer"
      - "TESTDIR=Perl/kelp"
@@ -171,7 +171,7 @@ env:
      - "TESTDIR=Python/wheezyweb"
      - "TESTDIR=Python/wsgi"
      - "TESTDIR=Ruby/grape"
-    # - "TESTDIR=Ruby/h2o_mruby"
+     - "TESTDIR=Ruby/h2o_mruby"
      - "TESTDIR=Ruby/hanami"
      - "TESTDIR=Ruby/padrino"
      - "TESTDIR=Ruby/rack"

frameworks/C++/poco/poco.dockerfile

@@ -9,7 +9,7 @@ RUN mkdir install
 WORKDIR /install
 
 RUN wget -q http://pocoproject.org/releases/poco-$VERSION/poco-$VERSION-all.tar.gz
-RUN tar xvf poco-$VERSION-all.tar.gz
+RUN tar xf poco-$VERSION-all.tar.gz
 
 RUN cp -R poco-$VERSION-all/ $POCO_HOME
 

frameworks/C++/treefrog/treefrog-base.dockerfile

@@ -7,8 +7,8 @@ RUN apt install -yqq g++ gcc libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
     qtdeclarative5-dev libqt5quick5 libqt5quickparticles5 libqt5gui5 libqt5printsupport5 \
     libqt5widgets5 libqt5opengl5-dev libqt5quicktest5
 
-RUN wget https://github.com/treefrogframework/treefrog-framework/archive/v${TFVER}.tar.gz
-RUN tar xvf v${TFVER}.tar.gz
+RUN wget -q https://github.com/treefrogframework/treefrog-framework/archive/v${TFVER}.tar.gz
+RUN tar xf v${TFVER}.tar.gz
 RUN cd treefrog-framework-${TFVER} && \
     ./configure && \
     cd src && \

frameworks/C++/wt/wt-base.dockerfile

@@ -16,8 +16,8 @@ RUN apt-get update -qq
 RUN apt-get install -qqy cmake
 
 # Build boost_thread, boost_system, boost_filesystem and boost_program_options
-RUN wget https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.gz
-RUN tar xvf boost_1_65_1.tar.gz
+RUN wget -q https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.gz
+RUN tar xf boost_1_65_1.tar.gz
 RUN cd boost_1_65_1 && \
     ./bootstrap.sh && \
     ./b2 \
@@ -34,9 +34,9 @@ RUN cd boost_1_65_1 && \
       --with-filesystem \
       install
 
-RUN wget https://github.com/emweb/wt/archive/$WT_VERSION.tar.gz
+RUN wget -q https://github.com/emweb/wt/archive/$WT_VERSION.tar.gz
 RUN mv $WT_VERSION.tar.gz wt-$WT_VERSION.tar.gz
-RUN tar xvf wt-$WT_VERSION.tar.gz
+RUN tar xf wt-$WT_VERSION.tar.gz
 
 RUN cd wt-$WT_VERSION && \
     mkdir -p build && \

frameworks/C/h2o/h2o.dockerfile

@@ -23,8 +23,8 @@ ENV YAJL_VERSION="2.1.0"
 ENV YAJL_ARCHIVE="${YAJL_VERSION}.tar.gz"
 ENV YAJL_BUILD_DIR="yajl-${YAJL_VERSION}"
 
-RUN wget https://github.com/lloyd/yajl/archive/${YAJL_ARCHIVE} && \
-    tar xvf ${YAJL_ARCHIVE} && \
+RUN wget -q https://github.com/lloyd/yajl/archive/${YAJL_ARCHIVE} && \
+    tar xf ${YAJL_ARCHIVE} && \
     cd ${YAJL_BUILD_DIR} && \
     ./configure -p /yajl && \
     make -j "$(nproc)" install
@@ -42,8 +42,8 @@ ENV BUILD_DIR="h2o-${VERSION}"
 
 RUN mkdir install
 RUN cd "${IROOT}" && \
-    wget "https://github.com/h2o/h2o/archive/$ARCHIVE" && \
-    tar xvf "$ARCHIVE" && \
+    wget -q "https://github.com/h2o/h2o/archive/$ARCHIVE" && \
+    tar xf "$ARCHIVE" && \
     cd "$BUILD_DIR" && \
     cmake -DCMAKE_INSTALL_PREFIX="$H2O_HOME" -DCMAKE_C_FLAGS="-flto -march=native" \
       -DCMAKE_AR=/usr/bin/gcc-ar -DCMAKE_RANLIB=/usr/bin/gcc-ranlib -DWITH_MRUBY=on && \

frameworks/C/libreactor/libreactor.dockerfile

@@ -2,19 +2,19 @@ FROM tfb/gcc-6:latest
 
 COPY ./ ./
 
-RUN wget https://github.com/fredrikwidlund/libdynamic/releases/download/v1.1.0/libdynamic-1.1.0.tar.gz && \
+RUN wget -q https://github.com/fredrikwidlund/libdynamic/releases/download/v1.1.0/libdynamic-1.1.0.tar.gz && \
     tar xfz libdynamic-1.1.0.tar.gz && \
     cd libdynamic-1.1.0 && \
     ./configure CC=gcc-6 AR=gcc-ar-6 NM=gcc-nm-6 RANLIB=gcc-ranlib-6 && \
     make && make install
 
-RUN wget https://github.com/fredrikwidlund/libreactor/releases/download/v1.0.0/libreactor-1.0.0.tar.gz && \
+RUN wget -q https://github.com/fredrikwidlund/libreactor/releases/download/v1.0.0/libreactor-1.0.0.tar.gz && \
     tar xfz libreactor-1.0.0.tar.gz && \
     cd libreactor-1.0.0 && \
     ./configure CC=gcc-6 AR=gcc-ar-6 NM=gcc-nm-6 RANLIB=gcc-ranlib-6 && \
     make && make install
 
-RUN wget https://github.com/fredrikwidlund/libclo/releases/download/v0.1.0/libclo-0.1.0.tar.gz && \
+RUN wget -q https://github.com/fredrikwidlund/libclo/releases/download/v0.1.0/libclo-0.1.0.tar.gz && \
     tar xfz libclo-0.1.0.tar.gz && \
     cd libclo-0.1.0 && \
     ./configure CC=gcc-6 AR=gcc-ar-6 NM=gcc-nm-6 RANLIB=gcc-ranlib-6 && \

frameworks/JavaScript/nodejs/mitol.dockerfile

@@ -5,7 +5,7 @@ COPY ./ ./
 RUN apt install -y wget
 RUN npm install
 RUN mkdir -p node_modules/mns & mkdir -p tmp
-RUN wget https://github.com/Helidium/Mitol/archive/v0.0.1.tar.gz -P tmp
+RUN wget -q https://github.com/Helidium/Mitol/archive/v0.0.1.tar.gz -P tmp
 RUN tar -xzvf tmp/v0.0.1.tar.gz -C tmp
 RUN make -C tmp/Mitol-0.0.1/node
 RUN cp tmp/Mitol-0.0.1/node/dist/* node_modules/mns

frameworks/JavaScript/ringojs/ringo-base.dockerfile

@@ -5,7 +5,7 @@ COPY ./ ./
 ENV RINGOJS_VERSION="1.1.0"
 ENV RINGOJS_HOME=/ringojs-$RINGOJS_VERSION
 
-RUN wget https://github.com/ringo/ringojs/releases/download/v$RINGOJS_VERSION/ringojs-$RINGOJS_VERSION.tar.gz && \
-    tar xvf ringojs-$RINGOJS_VERSION.tar.gz
+RUN wget -q https://github.com/ringo/ringojs/releases/download/v$RINGOJS_VERSION/ringojs-$RINGOJS_VERSION.tar.gz && \
+    tar xf ringojs-$RINGOJS_VERSION.tar.gz
 
 ENV PATH=${RINGOJS_HOME}/bin:${PATH}

frameworks/Lua/lapis/.gitignore

@@ -1,2 +0,0 @@
-logs
-nginx.conf.compiled

frameworks/Lua/octopus/.gitignore

@@ -1 +0,0 @@
-octopus

frameworks/Lua/octopus/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "octopus",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "plaintext_url": "/plaintext",
       "json_url": "/json",
       "db_url": "/db",

frameworks/Lua/octopus/octopus.dockerfile

@@ -0,0 +1,30 @@
+FROM tfb/lua:latest
+
+WORKDIR /octo
+
+RUN git clone https://github.com/cyberz-eu/octopus.git
+
+WORKDIR /octo/octopus
+# Dec 8th, 2017
+RUN git checkout 44c7e7ecdfd9e95703e73df85815c0cca4b441e8
+
+WORKDIR /octo
+
+ADD ./ /octo
+
+RUN cp -avr app octopus/extensions
+RUN cp -vf config.lua octopus/extensions
+
+RUN sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' octopus/extensions/config.lua
+
+WORKDIR /octo/octopus/bin/unix
+
+RUN chmod +x *.sh
+
+RUN sed -i 's|wget|wget -q|g' server.sh
+RUN sed -i 's|-c nginx.conf|-c nginx.conf -g "daemon off;"|g' server.sh
+
+RUN ./server.sh install
+RUN ./server.sh build
+
+CMD ./server.sh start

frameworks/Lua/octopus/setup.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql lua
-
-rm -rf octopus
-git clone https://github.com/cyberz-eu/octopus.git
-cd octopus
-# January 4th, 2017
-git checkout 0c4fc42198fed3a299c78d4b910188113d478bc5
-cd ..
-
-# The following line is a hacky way to get this framework working.
-# zlib fix needs to happen within the framework owner's repo
-sed -i 's|zlib_url=http://zlib.net/zlib-$zlib_version.tar.gz|zlib_url=https://github.com/madler/zlib/archive/v$zlib_version.tar.gz|g' octopus/bin/unix/server.sh
-
-cp -avr app octopus/extensions
-cp -vf config.lua octopus/extensions
-
-sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' octopus/extensions/config.lua
-
-cd octopus/bin/unix
-. ./server.sh install
-. ./server.sh build
-. ./server.sh start

frameworks/Lua/openresty/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "openresty",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",

frameworks/Lua/openresty/nginx.conf

@@ -1,5 +1,6 @@
 pid        /tmp/nginx.pid;
 error_log stderr error;
+daemon off;
 
 events {
     worker_connections  16384;
@@ -8,7 +9,7 @@ events {
 http {
     resolver 127.0.0.1;
     access_log off;
-    lua_package_path 'CWD/?.lua;;';
+    lua_package_path '/openresty/?.lua;;';
     init_by_lua_block {
         jit.opt.start("minstitch=10")
         require "resty.core"

frameworks/Lua/openresty/openresty.dockerfile

@@ -0,0 +1,12 @@
+FROM tfb/openresty-server:latest
+
+ADD ./nginx.conf /openresty/
+ADD ./app.lua /openresty/
+
+WORKDIR /openresty
+
+RUN sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' app.lua
+
+RUN luarocks install lua-resty-template
+
+CMD nginx -c /openresty/nginx.conf -g "worker_processes '"${CPU_COUNT}"';"

frameworks/Lua/openresty/setup.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-sed -i 's|CWD|'"${TROOT}"'|g' nginx.conf
-sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' app.lua
-
-fw_depends mysql lua luarocks openresty
-
-luarocks install lua-resty-template
-
-nginx -c $TROOT/nginx.conf -g "worker_processes '"${CPU_COUNT}"';" &

frameworks/Python/webware/webware.dockerfile

@@ -7,7 +7,7 @@ WORKDIR /webware
 RUN pip install --install-option="--prefix=${PY2_ROOT}" -r /webware/requirements.txt
 
 RUN wget -q https://downloads.sourceforge.net/webware/Webware-1.1.1.tar.gz
-RUN tar xvf Webware-1.1.1.tar.gz
+RUN tar xf Webware-1.1.1.tar.gz
 RUN cp -r app/ Webware-1.1.1/
 
 WORKDIR /webware/Webware-1.1.1

frameworks/Ur/urweb/urweb-base.dockerfile

@@ -7,8 +7,8 @@ ENV COMPILER=/urweb-build
 
 RUN apt install -yqq mlton libssl-dev libpq-dev libmysqlclient-dev
 RUN mkdir -p $COMPILER && \
-    wget http://www.impredicative.com/ur/urweb-$URWEB_VERSION.tgz && \
-    tar xvf urweb-$URWEB_VERSION.tgz && \
+    wget -q http://www.impredicative.com/ur/urweb-$URWEB_VERSION.tgz && \
+    tar xf urweb-$URWEB_VERSION.tgz && \
     cd urweb-$URWEB_VERSION && \
     ./configure --prefix=$COMPILER && \
     make && \

toolset/setup/docker/languages/d-lang.dockerfile

@@ -11,7 +11,7 @@ RUN mkdir -p $DLANG && \
     dpkg-deb -x dmd_$DMDVER-0_amd64.deb $DLANG && \
     cd $DLANG && \
     wget https://github.com/ldc-developers/ldc/releases/download/v$LDCVER/ldc2-$LDCVER-linux-x86_64.tar.xz && \
-    tar xvf ldc2-$LDCVER-linux-x86_64.tar.xz && \
+    tar xf ldc2-$LDCVER-linux-x86_64.tar.xz && \
     ln -s $DLANG/ldc2-$LDCVER-linux-x86_64/bin/ldc2 $DLANG/usr/bin/ldc2
 
 # According to this file (dmd.conf) dmd will, upon execution, look for

toolset/setup/docker/languages/lua.dockerfile

@@ -6,7 +6,7 @@ ENV LUA_MICRO="5"
 RUN apt install -yqq libreadline-dev lib32ncurses5-dev
 
 RUN wget https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
-RUN tar xvf $LUA_VERSION.$LUA_MICRO.tar.gz
+RUN tar xf $LUA_VERSION.$LUA_MICRO.tar.gz
 
 ENV LUA_HOME=/lua-$LUA_VERSION.$LUA_MICRO
 

toolset/setup/docker/languages/nim.dockerfile

@@ -4,7 +4,7 @@ ENV NIM_VERSION="0.11.2"
 ENV NIM_CSOURCES="6bf2282"
 
 RUN wget https://github.com/nim-lang/Nim/archive/v$NIM_VERSION.tar.gz
-RUN tar xvf v$NIM_VERSION.tar.gz
+RUN tar xf v$NIM_VERSION.tar.gz
 RUN mv Nim-$NIM_VERSION nim
 
 RUN cd nim && \

toolset/setup/docker/languages/pypy2.dockerfile

@@ -6,7 +6,7 @@ ENV PYPY2_VERSION=5.10.0
 ENV PATH=${PYPY2_ROOT}/bin:${PATH}
 
 RUN wget -q https://bitbucket.org/pypy/pypy/downloads/pypy2-v${PYPY2_VERSION}-linux64.tar.bz2
-RUN tar xvf pypy2-v${PYPY2_VERSION}-linux64.tar.bz2
+RUN tar xf pypy2-v${PYPY2_VERSION}-linux64.tar.bz2
 RUN mv pypy2-v${PYPY2_VERSION}-linux64 $PYPY2_ROOT
 
 RUN pypy -m ensurepip

toolset/setup/docker/languages/python2.dockerfile

@@ -8,7 +8,7 @@ ENV PATH=${PY2_ROOT}/bin:${PATH}
 RUN mkdir $PY2_ROOT
 
 RUN wget -q http://www.python.org/ftp/python/${PY2_VERSION}/Python-${PY2_VERSION}.tar.xz
-RUN tar xvf Python-${PY2_VERSION}.tar.xz
+RUN tar xf Python-${PY2_VERSION}.tar.xz
 
 WORKDIR Python-${PY2_VERSION}
 

toolset/setup/docker/languages/python3.dockerfile

@@ -8,7 +8,7 @@ ENV PATH=${PY3_ROOT}/bin:${PATH}
 RUN mkdir py3
 
 RUN wget -q http://www.python.org/ftp/python/${PY3_VERSION}/Python-${PY3_VERSION}.tar.xz
-RUN tar xvf Python-${PY3_VERSION}.tar.xz
+RUN tar xf Python-${PY3_VERSION}.tar.xz
 
 WORKDIR Python-${PY3_VERSION}
 

toolset/setup/docker/languages/rust.dockerfile

@@ -3,7 +3,7 @@ FROM tfb/base:latest
 ENV RUST_VERSION="1.24.1"
 
 RUN wget https://static.rust-lang.org/dist/rust-${RUST_VERSION}-x86_64-unknown-linux-gnu.tar.gz
-RUN tar xvf rust-${RUST_VERSION}-x86_64-unknown-linux-gnu.tar.gz
+RUN tar xf rust-${RUST_VERSION}-x86_64-unknown-linux-gnu.tar.gz
 
 RUN cd rust-${RUST_VERSION}-x86_64-unknown-linux-gnu && \
 	./install.sh --prefix=/rust

toolset/setup/docker/systools/luarocks.dockerfile

@@ -4,7 +4,7 @@ ENV LUAROCKS_VERSION="2.2.1"
 ENV LUAROCKS=/luarocks-$LUAROCKS_VERSION
 
 RUN wget http://luarocks.org/releases/luarocks-$LUAROCKS_VERSION.tar.gz
-RUN tar xvf luarocks-$LUAROCKS_VERSION.tar.gz
+RUN tar xf luarocks-$LUAROCKS_VERSION.tar.gz
 
 RUN cd $LUAROCKS && \
     ./configure --prefix=$LUA_HOME --with-lua=$LUA_HOME && \

toolset/setup/docker/systools/nimble.dockerfile

@@ -4,7 +4,7 @@ ENV NIMBLE_VERSION="0.6.2"
 
 RUN cd $NIM_HOME && \
     wget https://github.com/nim-lang/nimble/archive/v$NIMBLE_VERSION.tar.gz && \
-    tar xvf v$NIMBLE_VERSION.tar.gz && \
+    tar xf v$NIMBLE_VERSION.tar.gz && \
     mv nimble-$NIMBLE_VERSION nimble && \
     cd nimble && \
     ../bin/nim c src/nimble && \

toolset/setup/docker/webservers/microhttpd.dockerfile

@@ -5,7 +5,7 @@ ENV MICROHTTPD=/libmicrohttpd
 ENV MICROHTTPD_HOME=$MICROHTTPD-$VERSION
 
 RUN wget http://mirror.ibcp.fr/pub/gnu/libmicrohttpd/libmicrohttpd-$MICROHTTPD_VERSION.tar.gz
-RUN tar xvf libmicrohttpd-$MICROHTTPD_VERSION.tar.gz
+RUN tar xf libmicrohttpd-$MICROHTTPD_VERSION.tar.gz
 RUN cd libmicrohttpd-$MICROHTTPD_VERSION && \
     ./configure --prefix=$MICROHTTPD_HOME && \
     make install

toolset/setup/docker/webservers/nginx.dockerfile

@@ -6,7 +6,7 @@ ENV NGINX_HOME="/nginx"
 ENV NGINX_VERSION="1.12.2"
 
 RUN wget http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
-    tar xvf nginx-${NGINX_VERSION}.tar.gz && \
+    tar xf nginx-${NGINX_VERSION}.tar.gz && \
     cd nginx-${NGINX_VERSION} && \
     echo "Configuring nginx..." && \
     ./configure --prefix=/nginx && \

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

@@ -7,7 +7,7 @@ ENV OPENRESTY=/openresty
 ENV OPENRESTY_HOME=$OPENRESTY-$OPENRESTY_VERSION
 
 RUN wget http://openresty.org/download/openresty-$OPENRESTY_VERSION.tar.gz
-RUN tar xvf 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 && \