C tests for docker (#3304)

.travis.yml

@@ -11,12 +11,12 @@ python:
 
 env:
   matrix:
-    # - "TESTDIR=C/duda"
-    # - "TESTDIR=C/facil.io"
-    # - "TESTDIR=C/onion"
-    # - "TESTDIR=C/h2o"
-    # - "TESTDIR=C/octane"
-    # - "TESTDIR=C/libreactor"
+     - "TESTDIR=C/duda"
+     - "TESTDIR=C/facil.io"
+     - "TESTDIR=C/h2o"
+     - "TESTDIR=C/libreactor"
+     - "TESTDIR=C/octane"
+     - "TESTDIR=C/onion"
     # - "TESTDIR=CSharp/aspnet"
     # - "TESTDIR=CSharp/aspnetcore"
     # ## - "TESTDIR=CSharp/aspnet-stripped"

frameworks/C/duda/.gitignore

@@ -1,5 +0,0 @@
-*.o
-*~
-/Makefile
-/main.d
-/ws.duda

frameworks/C/duda/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "duda",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 2001,

frameworks/C/duda/duda.dockerfile

@@ -0,0 +1,13 @@
+FROM tfb:latest
+
+RUN apt install git python -y
+
+COPY ./ ./
+# Get v0.31 (no official releases that work 2015-06-25)
+
+RUN git clone https://github.com/monkey/dudac.git
+RUN cd dudac && git checkout 7c3d5b03b09fb4cb5f5e338fff72df2e25e95ef0 && \
+    ./dudac -r && \
+    ./dudac -s
+
+CMD ["./dudac/dudac", "-w", "webservice", "-p", "2001"]

frameworks/C/duda/setup.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends duda
-
-dudac -w $TROOT/webservice -p 2001 &

frameworks/C/facil.io/.gitignore

@@ -1,5 +0,0 @@
-# Add any files that are created at build/run-time
-#
-# Example: *.class, *.pyc, bin/
-
-facil_app/

frameworks/C/facil.io/benchmark_config.json

@@ -3,7 +3,6 @@
   "tests": [
     {
       "default": {
-        "setup_file": "setup",
         "json_url": "/json",
         "plaintext_url": "/plaintext",
         "port": 8080,

frameworks/C/facil.io/facil.io.dockerfile

@@ -0,0 +1,20 @@
+FROM tfb:latest
+
+COPY ./ ./
+
+RUN mkdir facil_app && \
+    cd facil_app && \
+    curl -s -o facil.io.tar.gz -LJO https://api.github.com/repos/boazsegev/facil.io/tarball/0.6.0.beta.6 && \
+    tar --strip-components=1 -xzf facil.io.tar.gz
+
+# compile test
+RUN mkdir facil_app/src && cp bench_app.c facil_app/src
+
+# we don't need more than 32K concurrent connections
+ENV CFLAGS="-DLIB_SOCK_MAX_CAPACITY=32768"
+
+# Build the app
+RUN cd facil_app && make -j build
+
+# Run the app
+CMD ["./facil_app/tmp/demo", "-p", "8080", "-db \"TFB-database\"", "-w", "-1", "-t", "1"]

frameworks/C/facil.io/setup.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# enter root folder
-cd $TROOT
-
-# remove existing installation, if any
-if [ -d facil_app ] ; then
-	rm -R facil_app
-fi
-
-# create new installation folder
-mkdir facil_app
-cd facil_app
-
-# Download and unpack
-
-curl -s -o facil.io.tar.gz -LJO https://api.github.com/repos/boazsegev/facil.io/tarball/0.6.0.beta.6
-tar --strip-components=1 -xzf facil.io.tar.gz
-if [ $? -ne 0 ]; then echo "Couldn't extract tar."; exit 1; fi
-rm facil.io.tar.gz
-./scripts/new/cleanup
-cd ..
-
-
-# compile test
-rm -r facil_app/src
-mkdir facil_app/src
-cp bench_app.c facil_app/src
-cd facil_app
-
-# we don't need more than 32K concurrent connections
-export CFLAGS="-DLIB_SOCK_MAX_CAPACITY=32768"
-
-# Build the app
-make -j build
-
-# Run the upp
-cd tmp
-./demo -p 8080 -db "TFB-database" -w -1 -t 1 &
-# step out of app folder
-cd ../..
- 

frameworks/C/h2o/benchmark_config.json

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

frameworks/C/h2o/h2o.dockerfile

@@ -0,0 +1,54 @@
+FROM ruby-2.4:latest
+
+COPY ./ ./
+
+RUN ls
+
+RUN apt install -yqq cmake automake libpq-dev libnuma-dev checkinstall autoconf pkg-config libtool python-sphinx libcunit1-dev nettle-dev libyaml-dev
+
+### Install mustache-c
+
+RUN git clone https://github.com/x86-64/mustache-c.git && \
+    cd mustache-c && \
+    git checkout 55dafd1e95adaca90ea50efb9a8573786514c85a && \
+    CFLAGS="-O3 -flto -march=native" ./configure --prefix=/mustache-c && \
+    make -j "$(nproc)" install
+
+ENV MUSTACHE_C_HOME=/mustache-c
+ENV LD_LIBRARY_PATH=/mustache-c/lib:${LD_LIBRARY_PATH}
+
+### Install yajl
+
+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} && \
+    cd ${YAJL_BUILD_DIR} && \
+    ./configure -p /yajl && \
+    make -j "$(nproc)" install
+
+ENV YAJL_HOME=/yajl
+ENV LD_LIBRARY_PATH=/yajl/lib:${LD_LIBRARY_PATH}
+
+### Install h2o
+
+ENV IROOT="/install"
+ENV H2O_HOME="${IROOT}/h2o"
+ENV VERSION="2.2.4"
+ENV ARCHIVE="v${VERSION}.tar.gz"
+ENV BUILD_DIR="h2o-${VERSION}"
+
+RUN mkdir install
+RUN cd "${IROOT}" && \
+    wget "https://github.com/h2o/h2o/archive/$ARCHIVE" && \
+    tar xvf "$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 && \
+    make -j "$(nproc)" install
+
+ENV PATH=${H2O_HOME}/bin:${PATH}
+
+CMD ["./setup.sh"]

frameworks/C/h2o/setup.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-fw_depends postgresql h2o mustache-c yajl
-
+TROOT="/"
 H2O_APP_HOME="${IROOT}/h2o_app"
 BUILD_DIR="${H2O_APP_HOME}_build"
 H2O_APP_PROFILE_PORT=54321
 H2O_APP_PROFILE_URL="http://127.0.0.1:$H2O_APP_PROFILE_PORT"
-NUM_WORKERS="$CPU_COUNT"
+NUM_WORKERS=$(nproc)
+CPU_COUNT=$(nproc)
 
 # A hacky way to detect whether we are running in the physical hardware or the cloud environment.
 if [[ "$CPU_COUNT" -gt 16 ]]; then
@@ -78,4 +78,4 @@ if "$USE_PROCESSES"; then
 else
 	echo "Running h2o_app multithreaded."
 	run_h2o_app 0 "${H2O_APP_HOME}/bin" "${H2O_APP_HOME}/share/h2o_app"
-fi
+fi

frameworks/C/libreactor/benchmark_config.json

@@ -3,7 +3,6 @@
   "tests": [
     {
       "default": {
-        "setup_file": "setup",
         "json_url": "/json",
         "plaintext_url": "/plaintext",
         "port": 8080,

frameworks/C/libreactor/libreactor.dockerfile

@@ -0,0 +1,25 @@
+FROM gcc-6:latest
+
+COPY ./ ./
+
+RUN wget 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 && \
+    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 && \
+    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 && \
+    make && make install
+
+RUN make clean && make
+
+CMD ["./libreactor"]

frameworks/C/libreactor/setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends libreactor
-
-make clean && make
-
-./libreactor &

frameworks/C/octane/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "octane",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "plaintext_url": "/plaintext",
       "json_url": "/json",
       "port": 8000,

frameworks/C/octane/octane.dockerfile

@@ -0,0 +1,16 @@
+FROM tfb:latest
+
+COPY ./ ./
+
+RUN apt install -yqq cmake automake libtool
+
+# May 22nd, 2017
+RUN git clone https://github.com/simongui/octane.git && \
+    cd octane && \
+    git checkout 8c28b1b83f1aa2817a401a3e8437a0af4ec53c28 && \
+    make
+
+ENV PATH=octane/build/:${PATH}
+ENV LD_PRELOAD=octane/lib/lockless_allocator/libllalloc.so.1.3
+
+CMD ["techempower_benchmarks"]

frameworks/C/octane/setup.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends octane
-
-LD_PRELOAD="$OCTANE_HOME/lib/lockless_allocator/libllalloc.so.1.3" techempower_benchmarks &

frameworks/C/onion/.gitignore

@@ -1,2 +0,0 @@
-/assets.h
-/onion

frameworks/C/onion/benchmark_config.json

@@ -2,26 +2,7 @@
   "framework": "onion",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Platform",
-      "database": "None",
-      "framework": "None",
-      "language": "C",
-      "flavor": "None",
-      "orm": "Raw",
-      "platform": "None",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "onion",
-      "notes": "",
-      "versus": "onion"
-    },
-    "raw": {
-      "setup_file": "setup",
       "db_url": "/db",
       "query_url": "/queries?queries=",
       "fortune_url": "/fortune",

frameworks/C/onion/hello.c

@@ -334,7 +334,7 @@ int main(void){
 			ONION_ERROR("Cant create db connection: %s", mysql_error(data.db[i]));
 			return 1;
 		}
-		if (mysql_real_connect(data.db[i], "127.0.0.1", 
+		if (mysql_real_connect(data.db[i], "TFB-database",
                         "benchmarkdbuser", "benchmarkdbpass", "hello_world", 0, NULL, 0) == NULL) {
 			ONION_ERROR("Error %u: %s\n", mysql_errno(data.db[i]), mysql_error(data.db[i]));
 			return 1;

frameworks/C/onion/onion.dockerfile

@@ -0,0 +1,24 @@
+FROM tfb:latest
+
+COPY ./ ./
+
+RUN apt install -yqq cmake libmysqlclient-dev libjson0-dev libgnutls-dev libgcrypt-dev
+
+ENV ONION_LOG noinfo
+
+# Latest commit on master as of July 10 2014
+# This is post tag v0.7, but pre any later tags
+
+RUN git clone https://github.com/davidmoreno/onion.git && \
+    cd onion && \
+    git checkout c460557bfc7d45fb6ba61cb6b7259480a67dde82 && \
+    mkdir -p build && \
+    cd build && \
+    cmake .. && \
+    make
+
+RUN make clean && \
+    rm -f onion/build/CMakeCache.txt && \
+    make
+
+CMD ["./hello"]

frameworks/C/onion/setup.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql onion
-
-sed -i 's|127.0.0.1|'${DBHOST}'|g' hello.c
-
-make clean
-ln -s $IROOT/onion onion
-rm -f onion/build/CMakeCache.txt
-make
-./hello &

frameworks/JavaScript/ringojs/ringojs-base.dockerfile

@@ -0,0 +1,13 @@
+FROM java:latest
+
+ENV NODE_ENV=production
+
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+RUN apt install -y nodejs
+
+ENV RINGO_VERSION 1.1.0
+
+RUN wget -O https://github.com/ringo/ringojs/releases/download/v$VERSION/ringojs-${RINGO_VERSION}.tar.gz
+RUN tar xvf ringojs-${RINGO_VERSION}.tar.gz
+
+ENV PATH="ringojs-${RINGO_VERSION}/bin:${PATH}"

frameworks/JavaScript/ringojs/ringojs.dockerfile

@@ -0,0 +1,7 @@
+FROM ringo-base:latest
+
+RUN ringo-admin install oberhamsi/sql-ringojs-client
+RUN ringo-admin install orfon/reinhardt
+RUN (cd ringo-${RINGO_VEFRSION}/packages/sql-ringojs-client/jars && curl -s -o mysql.jar https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.39/mysql-connector-java-5.1.39.jar)
+
+CMD ["ringo", "--production", "-J-server", "-J-Xmx1g", "-J-Xms1g", "ringo-main.js", "--host 0.0.0.0"]

toolset/setup/linux/docker/languages/ruby-2.4.dockerfile

@@ -0,0 +1,21 @@
+FROM tfb:latest
+
+RUN apt install -yqq llvm-dev libjemalloc-dev zlib1g-dev libssl-dev libcurl4-openssl-dev bison
+
+ENV RUBY_VERSION 2.4.2
+ENV RUBY_GEMS 2.6.12
+
+RUN cd /usr/local/src && \
+    wget https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz && \
+    tar zxvf ruby-${RUBY_VERSION}.tar.gz && \
+    cd ruby-${RUBY_VERSION} && \
+    ./configure && \
+    make && \
+    make install
+
+RUN wget https://rubygems.org/rubygems/rubygems-${RUBY_GEMS}.tgz && \
+    tar zxvf rubygems-${RUBY_GEMS}.tgz && \
+    cd rubygems-${RUBY_GEMS} && \
+    /usr/local/bin/ruby setup.rb
+
+RUN gem install bundler --no-ri --no-rdoc

toolset/setup/linux/docker/systools/gcc-6.dockerfile

@@ -0,0 +1,5 @@
+FROM tfb:latest
+
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
+    apt-get -yq update && \
+    apt-get install -qqy gcc-6 g++-6

toolset/setup/linux/frameworks/duda.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-fw_installed duda && return 0
-
-git clone https://github.com/monkey/dudac.git
-
-DUDA_HOME=$IROOT/dudac
-cd $DUDA_HOME
-
-# Get v0.31 (no official releases that work 2015-06-25)
-git checkout 7c3d5b03b09fb4cb5f5e338fff72df2e25e95ef0
-
-./dudac -r
-./dudac -s
-
-echo "export DUDA_HOME=${DUDA_HOME}" > $IROOT/duda.installed
-echo -e "export PATH=\$DUDA_HOME:$PATH" >> $IROOT/duda.installed
-
-source $IROOT/duda.installed

toolset/setup/linux/frameworks/libreactor.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-fw_depends gcc-6
-
-fw_installed libreactor && return 0
-
-mkdir -p ${CROOT} || true
-cd ${CROOT}
-
-LIBREACTOR_HOME=$IROOT/libreactor
-mkdir -p $LIBREACTOR_HOME
-
-cd $LIBREACTOR_HOME
-wget 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 && sudo make install
-
-cd $LIBREACTOR_HOME
-wget 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 && sudo make install
-
-cd $LIBREACTOR_HOME
-wget 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
-make && sudo make install
-
-cd $LIBREACTOR_HOME
-echo "export LIBREACTOR_HOME=${LIBREACTOR_HOME}" >> $IROOT/libreactor.installed
-
-source $IROOT/libreactor.installed

toolset/setup/linux/frameworks/octane.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-fw_installed octane && return 0
-
-OCTANE_HOME=$IROOT/octane
-
-git clone https://github.com/simongui/octane.git
-cd $OCTANE_HOME
-# May 22nd, 2017
-git checkout 8c28b1b83f1aa2817a401a3e8437a0af4ec53c28
-make
-
-echo "export OCTANE_HOME=${OCTANE_HOME}" >> $IROOT/octane.installed
-echo -e "export PATH=\$OCTANE_HOME/build/:\$PATH" >> $IROOT/octane.installed
-
-source $IROOT/octane.installed

toolset/setup/linux/frameworks/onion.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-fw_installed onion && return 0
-
-git clone https://github.com/davidmoreno/onion.git
-cd $IROOT/onion
-
-# Latest commit on master as of July 10 2014
-# This is post tag v0.7, but pre any later tags
-git checkout c460557bfc7d45fb6ba61cb6b7259480a67dde82
-
-mkdir -p build
-cd build
-cmake ..
-make
-
-echo "export ONION_LOG=noinfo" > $IROOT/onion.installed
-
-source $IROOT/onion.installed

toolset/setup/linux/systools/gcc-6.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-fw_installed gcc-6 && return 0
-
-sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-sudo apt-get -yq update
-sudo apt-get install -qqy gcc-6 g++-6
-
-touch $IROOT/gcc-6.installed

toolset/setup/linux/systools/mustache-c.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-fw_installed mustache-c && return 0
-
-MUSTACHE_C_HOME="${IROOT}/mustache-c"
-BUILD_DIR="${MUSTACHE_C_HOME}_build"
-
-git clone 'https://github.com/x86-64/mustache-c.git' "$BUILD_DIR"
-pushd "$BUILD_DIR"
-git checkout 55dafd1e95adaca90ea50efb9a8573786514c85a
-CFLAGS="-O3 -flto -march=native" ./configure --prefix="$MUSTACHE_C_HOME"
-make -j "$(nproc)" install
-popd
-rm -rf "$BUILD_DIR"
-
-echo "export MUSTACHE_C_HOME=$MUSTACHE_C_HOME" > "${IROOT}/mustache-c.installed"
-echo -e "export LD_LIBRARY_PATH=\$MUSTACHE_C_HOME/lib:\$LD_LIBRARY_PATH" \
-	>> "${IROOT}/mustache-c.installed"
-
-source "${IROOT}/mustache-c.installed"

toolset/setup/linux/systools/yajl.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-fw_installed yajl && return 0
-
-VERSION="2.1.0"
-ARCHIVE="${VERSION}.tar.gz"
-BUILD_DIR="yajl-${VERSION}"
-YAJL_HOME="${IROOT}/yajl"
-
-pushd "${IROOT}"
-fw_get -O "https://github.com/lloyd/yajl/archive/$ARCHIVE"
-fw_untar "$ARCHIVE"
-pushd "$BUILD_DIR"
-./configure -p "$YAJL_HOME"
-make -j "$(nproc)" install
-popd
-rm -rf "$BUILD_DIR"
-popd
-
-echo "export YAJL_HOME=$YAJL_HOME" > "${IROOT}/yajl.installed"
-echo -e "export LD_LIBRARY_PATH=\$YAJL_HOME/lib:\$LD_LIBRARY_PATH" \
-	>> "${IROOT}/yajl.installed"
-
-source "${IROOT}/yajl.installed"