WIP: Dockerify everything (#3457)

The toolset is invoked in a container, wrk is run from a container, the framework implementations are run from within a container, and the databases are run in a container.

.travis.yml

@@ -3,10 +3,13 @@
 #
 
 sudo: required
+group: deprecated-2017-Q4
 dist: trusty
 language: generic
 python:
   - "2.7"
+services:
+  - docker
 
 env:
   matrix:
@@ -194,27 +197,23 @@ env:
      - "TESTDIR=Vala/vsgi"
      - "TESTDIR=Vala/valum"
 
+install:
+  - docker pull techempower/tfb.wrk
+  - docker pull techempower/tfb
+
 before_script:
 
   # Runs travis_diff, printing the output to the terminal, and searches for travis-diff-continue
   # to determine if the suite should be installed and the current $TESTDIR test should run.
   - export RUN_TESTS=`./toolset/travis/travis_diff.py | tee /dev/tty | grep -oP "travis-run-tests \K(.*)"`
 
-  # travis_setup.sh runs all the same commands you would run if you were setting up
-  # a development environment via:
-  # http://frameworkbenchmarks.readthedocs.io/en/latest/Development/Installation-Guide/
-  # it also stops a few conflicting services
-  - if [ "$RUN_TESTS" ]; then source ./toolset/travis/travis_setup.sh; else echo 'Skipping travis_setup.sh'; fi
+  # Stop services that would claim ports we may need
+  - sudo service mysql stop
+  - sudo service postgresql stop
 
 script:
 
   # run-ci.py runs the diffing to see if travis needs to test this framework. Ideally/eventually,
   # we'd like to try and do the diffing before travis_clean & setup.
   # This will run the tests exactly as you would in your own vm:
-  # ./toolset/run-tests.py --mode verify --test (all the valid tests for this framework)
-  - if [ "$RUN_TESTS" ]; then tfb --mode verify --test-dir $RUN_TESTS; else echo 'Skipping test verification.'; fi
-
-cache:
-  directories:
-    - $HOME/.m2/repository
-    - $HOME/.cache/pip
+  - if [ "$RUN_TESTS" ]; then docker network create tfb > /dev/null 2>&1 && docker run --network=tfb -v /var/run/docker.sock:/var/run/docker.sock --mount type=bind,source=`pwd`,target=/FrameworkBenchmarks techempower/tfb --mode verify --test-dir $RUN_TESTS; else echo 'Skipping test verification.'; fi

Dockerfile

@@ -0,0 +1,22 @@
+FROM ubuntu:16.04
+
+# One -q produces output suitable for logging (mostly hides
+# progress indicators)
+RUN apt-get -yq update
+
+# WARNING: DONT PUT A SPACE AFTER ANY BACKSLASH OR APT WILL BREAK
+RUN apt-get -qqy install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
+  git-core \
+  cloc dstat                    `# Collect resource usage statistics` \
+  python-dev \
+  python-pip \
+  python-software-properties \
+  libmysqlclient-dev            `# Needed for MySQL-python` \
+  libpq-dev                     `# Needed for psycopg2`
+
+RUN pip install colorama==0.3.1 requests MySQL-python psycopg2-binary pymongo docker==3.1.0
+
+ENV PYTHONPATH /FrameworkBenchmarks
+ENV FWROOT /FrameworkBenchmarks
+
+ENTRYPOINT ["python", "/FrameworkBenchmarks/toolset/run-tests.py"]

benchmark.cfg.example

@@ -1,31 +0,0 @@
-[Defaults]
-# Available Keys:
-os=linux
-server_host=127.0.0.1
-client_host=127.0.0.1
-client_identity_file=/home/techempower/.ssh/id_rsa
-client_user=techempower
-database_host=127.0.0.1
-database_identity_file=/home/techempower/.ssh/id_rsa
-database_os=linux
-database_user=techempower
-duration=15
-exclude=None
-install=server
-install_error_action=continue
-install_strategy=unified
-install_only=False
-list_tests=False
-concurrency_levels=[16, 32, 64, 128, 256, 512]
-pipeline_concurrency_levels=[256,1024,4096,16384]
-query_levels=[1,5,10,15,20]
-cached_query_levels=[1,10,20,50,100]
-mode=benchmark
-test=None
-type=all
-verbose=True
-clean=False
-ulimit=200000
-#results_name=My Benchmarking Run %%Y-%%m-%%d %%H:%%M:%%S
-#results_environment=My Server Environment
-#results_upload_uri=https://example.com/uploads

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

@@ -1,4 +1,4 @@
-FROM tfb/gcc-4.8:latest
+FROM techempower/gcc-4.8:0.1
 
 WORKDIR /installs
 

frameworks/C++/cpoll_cppsp/cpoll_cppsp-postgres-raw-threadpool.dockerfile

@@ -1,3 +1,3 @@
-FROM tfb/cpoll_cppsp-base:latest
+FROM techempower/cpoll_cppsp-base:0.1
 
 CMD ./run_application /cpoll_cppsp/www -g g++-4.8 -m /forcedynamic.cppsm

frameworks/C++/cpoll_cppsp/cpoll_cppsp-postgres-raw.dockerfile

@@ -1,3 +1,3 @@
-FROM tfb/cpoll_cppsp-base:latest
+FROM techempower/cpoll_cppsp-base:0.1
 
 CMD ./run_application /cpoll_cppsp/www -g g++-4.8 -m /forcedynamic.cppsm

frameworks/C++/cpoll_cppsp/cpoll_cppsp-raw.dockerfile

@@ -1,3 +1,3 @@
-FROM tfb/cpoll_cppsp-base:latest
+FROM techempower/cpoll_cppsp-base:0.1
 
 CMD ./run_application /cpoll_cppsp/www -g g++-4.8 -m /forcedynamic.cppsm

frameworks/C++/cpoll_cppsp/cpoll_cppsp.dockerfile

@@ -1,3 +1,3 @@
-FROM tfb/cpoll_cppsp-base:latest
+FROM techempower/cpoll_cppsp-base:0.1
 
 CMD ./run_application /cpoll_cppsp/www -g g++-4.8 -m /forcedynamic.cppsm

frameworks/C++/cpoll_cppsp/www/connectioninfo.H

@@ -1,4 +1,4 @@
-#define BENCHMARK_DB_HOST "TFB-database"
+#define BENCHMARK_DB_HOST "tfb-database"
 #define MYSQL_MAX_CONNECTIONS 3000
 
 #include <stdexcept>

frameworks/C++/cppcms/config-direct-mysql.json

@@ -11,10 +11,10 @@
         "enable": false
     },
     "app": {
-        "db_connection_string": "mysql:host=TFB-database;database=hello_world;user=benchmarkdbuser;password=benchmarkdbpass;set_charset_name=utf8;@pool_size=10"
+        "db_connection_string": "mysql:host=tfb-database;database=hello_world;user=benchmarkdbuser;password=benchmarkdbpass;set_charset_name=utf8;@pool_size=10"
     },
     "cache": {
         "backend": "thread_shared",
         "limit": 10000
     }
-}
+}

frameworks/C++/cppcms/config-nginx-mysql.json

@@ -1,7 +1,7 @@
 {
     "service": {
         "api": "fastcgi",
-        "socket" : "/var/tmp/cppcms.sock"
+        "socket": "/var/tmp/cppcms.sock"
     },
     "http": {
         "script": "/"
@@ -10,10 +10,10 @@
         "enable": false
     },
     "app": {
-        "db_connection_string": "mysql:host=TFB-database;database=hello_world;user=benchmarkdbuser;password=benchmarkdbpass;set_charset_name=utf8;@pool_size=10"
+        "db_connection_string": "mysql:host=tfb-database;database=hello_world;user=benchmarkdbuser;password=benchmarkdbpass;set_charset_name=utf8;@pool_size=10"
     },
     "cache": {
         "backend": "thread_shared",
         "limit": 10000
     }
-}
+}

frameworks/C++/cppcms/config-nginx-postgresql.json

@@ -1,7 +1,7 @@
 {
     "service": {
         "api": "fastcgi",
-        "socket" : "/var/tmp/cppcms.sock"
+        "socket": "/var/tmp/cppcms.sock"
     },
     "http": {
         "script": "/"
@@ -10,10 +10,10 @@
         "enable": false
     },
     "app": {
-        "db_connection_string": "postgresql:host=TFB-database;dbname=hello_world;user=benchmarkdbuser;password=benchmarkdbpass;@pool_size=10"
+        "db_connection_string": "postgresql:host=tfb-database;dbname=hello_world;user=benchmarkdbuser;password=benchmarkdbpass;@pool_size=10"
     },
     "cache": {
         "backend": "thread_shared",
         "limit": 10000
     }
-}
+}

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

@@ -1,4 +1,4 @@
-FROM tfb/nginx:latest
+FROM techempower/nginx:0.1
 
 RUN apt install -yqq libgcrypt11-dev cmake python
 

frameworks/C++/cppcms/cppcms-direct.dockerfile

@@ -1,3 +1,3 @@
-FROM tfb/cppcms-base:latest
+FROM techempower/cppcms-base:0.1
 
 CMD ./mycppcms -c config-direct-mysql.json

frameworks/C++/cppcms/cppcms-postgres.dockerfile

@@ -1,3 +1,3 @@
-FROM tfb/cppcms-base:latest
+FROM techempower/cppcms-base:0.1
 
 CMD nginx -c /cppcms/nginx.conf && ./mycppcms -c config-nginx-postgresql.json

frameworks/C++/cppcms/cppcms.dockerfile

@@ -1,3 +1,3 @@
-FROM tfb/cppcms-base:latest
+FROM techempower/cppcms-base:0.1
 
 CMD nginx -c /cppcms/nginx.conf && ./mycppcms -c config-nginx-mysql.json

frameworks/C++/cutelyst/cutelyst-benchmark-app.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-framework:latest
+FROM techempower/cutelyst-framework:0.1
 
 ENV TROOT=/cutelyst-benchmark-app
 ENV LD_LIBRARY_PATH=${CMAKE_PREFIX_PATH}/lib

frameworks/C++/cutelyst/cutelyst-deps.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/base:latest
+FROM techempower/base:0.1
 
 ENV QT_VERSION_MM=59
 ENV QT_VERSION_FULL=594-xenial

frameworks/C++/cutelyst/cutelyst-framework.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-deps:latest
+FROM techempower/cutelyst-deps:0.1
 
 ENV CUTELYST_VER=2.0.1
 

frameworks/C++/cutelyst/cutelyst-nginx-base.dockerfile

@@ -1,5 +1,5 @@
-FROM tfb/nginx:latest
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/nginx:0.1
+FROM techempower/cutelyst-benchmark-app:0.1
 
 COPY --from=0 /nginx /nginx
 

frameworks/C++/cutelyst/cutelyst-nginx-my.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-nginx-base:latest
+FROM techempower/cutelyst-nginx-base:0.1
 
 ENV C_THREADS=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-nginx-pg.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-nginx-base:latest
+FROM techempower/cutelyst-nginx-base:0.1
 
 ENV C_THREADS=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-nginx.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-nginx-base:latest
+FROM techempower/cutelyst-nginx-base:0.1
 
 ENV C_THREADS=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-pf-my-nodelay.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_THREADS=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-pf-my.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_THREADS=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-pf-nodelay.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_THREADS=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-pf-pg-nodelay.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_THREADS=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-pf-pg.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_THREADS=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-thread-my-nodelay.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_PROCESSES=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-thread-my.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_PROCESSES=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-thread-nodelay.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_PROCESSES=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-thread-pg-nodelay.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_PROCESSES=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-thread-pg.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_PROCESSES=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst-thread.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_PROCESSES=1
 ENV CPU_AFFINITY=1

frameworks/C++/cutelyst/cutelyst.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/cutelyst-benchmark-app:latest
+FROM techempower/cutelyst-benchmark-app:0.1
 
 ENV C_THREADS=1
 ENV CPU_AFFINITY=1

frameworks/C++/ffead-cpp/ffead-cpp-apache-mongo.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-httpd:latest
+FROM techempower/ffead-cpp-httpd:0.1
 
 WORKDIR ${IROOT}/ffead-cpp-src/
 

frameworks/C++/ffead-cpp/ffead-cpp-apache-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-httpd:latest
+FROM techempower/ffead-cpp-httpd:0.1
 
 WORKDIR ${IROOT}/ffead-cpp-src/
 

frameworks/C++/ffead-cpp/ffead-cpp-apache-postgresql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-httpd:latest
+FROM techempower/ffead-cpp-httpd:0.1
 
 WORKDIR ${IROOT}/ffead-cpp-src/
 

frameworks/C++/ffead-cpp/ffead-cpp-base.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/base:latest
+FROM techempower/base:0.1
 
 ENV IROOT=/installs
 ENV FFEAD_CPP_PATH=${IROOT}/ffead-cpp-2.0

frameworks/C++/ffead-cpp/ffead-cpp-emb-base.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-base:latest
+FROM techempower/ffead-cpp-base:0.1
 
 WORKDIR ${IROOT}/ffead-cpp-src/
 

frameworks/C++/ffead-cpp/ffead-cpp-framework.sh

@@ -2,9 +2,9 @@
 
 #From https://github.com/TechEmpower/FrameworkBenchmarks/blob/master/frameworks/C%2B%2B/ulib/setup_json.sh
 if [ "$TRAVIS" != "true" ]; then
-MAX_THREADS=$(( 3 * $CPU_COUNT / 2 ))
+MAX_THREADS=$(( 3 * nproc / 2 ))
 else
-MAX_THREADS=$(( 2 * $CPU_COUNT ))
+MAX_THREADS=$(( 2 * nproc ))
 fi
 
 WRIT_THREADS=$(( $MAX_THREADS / 3 ))

frameworks/C++/ffead-cpp/ffead-cpp-httpd.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-base:latest
+FROM techempower/ffead-cpp-base:0.1
 
 COPY ffead-cpp-httpd.sh ./
 

frameworks/C++/ffead-cpp/ffead-cpp-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-base:latest
+FROM techempower/ffead-cpp-base:0.1
 
 WORKDIR ${IROOT}/ffead-cpp-src/
 

frameworks/C++/ffead-cpp/ffead-cpp-nginx-mongo.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-nginx:latest
+FROM techempower/ffead-cpp-nginx:0.1
 
 WORKDIR ${IROOT}/ffead-cpp-src/
 

frameworks/C++/ffead-cpp/ffead-cpp-nginx-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-nginx:latest
+FROM techempower/ffead-cpp-nginx:0.1
 
 WORKDIR ${IROOT}/ffead-cpp-src/
 

frameworks/C++/ffead-cpp/ffead-cpp-nginx-postgresql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-nginx:latest
+FROM techempower/ffead-cpp-nginx:0.1
 
 WORKDIR ${IROOT}/ffead-cpp-src/
 

frameworks/C++/ffead-cpp/ffead-cpp-nginx.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-base:latest
+FROM techempower/ffead-cpp-base:0.1
 
 WORKDIR $IROOT
 

frameworks/C++/ffead-cpp/ffead-cpp-postgresql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-base:latest
+FROM techempower/ffead-cpp-base:0.1
 
 WORKDIR ${IROOT}/ffead-cpp-src/
 

frameworks/C++/ffead-cpp/ffead-cpp.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ffead-cpp-base:latest
+FROM techempower/ffead-cpp-base:0.1
 
 WORKDIR ${IROOT}/ffead-cpp-src/
 

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

@@ -1,4 +1,4 @@
-FROM tfb/gcc-4.9:latest
+FROM techempower/gcc-4.9:0.1
 
 RUN apt install -yqq python-dev python-pip cmake autoconf
 

frameworks/C++/luna/luna-epoll.dockerfile

@@ -1,3 +1,3 @@
-FROM tfb/luna-base:latest
+FROM techempower/luna-base:0.1
 
 CMD /luna/bin/lunabench_epoll 8080 $((2 * $(nproc)))

frameworks/C++/luna/luna-thread.dockerfile

@@ -1,3 +1,3 @@
-FROM tfb/luna-base:latest
+FROM techempower/luna-base:0.1
 
 CMD /luna/bin/lunabench_thread 8080

frameworks/C++/luna/luna.dockerfile

@@ -1,3 +1,3 @@
-FROM tfb/luna-base:latest
+FROM techempower/luna-base:0.1
 
 CMD /luna/bin/lunabench_default 8080 $((2 * $(nproc)))

frameworks/C++/poco/poco.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/gcc-4.8:latest
+FROM techempower/gcc-4.8:0.1
 
 ENV IROOT=/install
 ENV VERSION=1.6.1

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

@@ -1,4 +1,4 @@
-FROM tfb/microhttpd:latest
+FROM techempower/microhttpd:0.1
 
 RUN apt install -yqq libboost-dev cmake
 

frameworks/C++/silicon/silicon.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/silicon-base:latest
+FROM techempower/silicon-base:0.1
 
 RUN cd build && \
     cmake .. -DCMAKE_CXX_COMPILER=clang++-3.9 && \

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

@@ -1,4 +1,4 @@
-FROM tfb/base:latest
+FROM techempower/base:0.1
 
 ENV TFVER=1.19.0
 

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

@@ -1,4 +1,4 @@
-FROM tfb/treefrog-base:latest
+FROM techempower/treefrog-base:0.1
 
 RUN sed -i 's|DriverType=.*|DriverType=QMYSQL|g' config/database.ini
 RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=hybrid|g' config/application.ini

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

@@ -1,4 +1,4 @@
-FROM tfb/treefrog-base:latest
+FROM techempower/treefrog-base:0.1
 
 RUN sed -i 's|DriverType=.*|DriverType=QMYSQL|g' config/database.ini
 RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=thread|g' config/application.ini

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

@@ -1,4 +1,4 @@
-FROM tfb/treefrog-base:latest
+FROM techempower/treefrog-base:0.1
 
 RUN sed -i 's|DriverType=.*|DriverType=QPSQL|g' config/database.ini
 RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=thread|g' config/application.ini

frameworks/C++/treefrog/treefrog.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/treefrog-base:latest
+FROM techempower/treefrog-base:0.1
 
 RUN sed -i 's|DriverType=.*|DriverType=QMYSQL|g' config/database.ini
 RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=thread|g' config/application.ini

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

@@ -1,4 +1,4 @@
-FROM tfb/gcc-6:latest
+FROM techempower/gcc-6:0.1
 
 ENV IROOT=/install
 ENV ULIB_VERSION=1.4.2

frameworks/C++/ulib/ulib-json.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ulib-base:latest
+FROM techempower/ulib-base:0.1
 
 # 1. Change ULib Server (userver_tcp) configuration
 RUN sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g" $IROOT/ULib/benchmark.cfg

frameworks/C++/ulib/ulib-json_fit.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ulib-base:latest
+FROM techempower/ulib-base:0.1
 
 # 1. Change ULib Server (userver_tcp) configuration
 RUN sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g" $IROOT/ULib/benchmark.cfg

frameworks/C++/ulib/ulib-mongodb.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ulib-base:latest
+FROM techempower/ulib-base:0.1
 
 # 1. Change ULib Server (userver_tcp) configuration
 RUN sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g" $IROOT/ULib/benchmark.cfg
@@ -6,7 +6,7 @@ RUN sed -i "s|LISTEN_BACKLOG .*|LISTEN_BACKLOG 256|g" $IROOT/ULib/benchmark.cfg
 RUN sed -i "s|CLIENT_FOR_PARALLELIZATION .*|CLIENT_FOR_PARALLELIZATION 100|g"  $IROOT/ULib/benchmark.cfg
 
 # 2. Start ULib Server (userver_tcp)
-ENV MONGODB_HOST=TFB-database
+ENV MONGODB_HOST=tfb-database
 ENV UMEMPOOL="96,0,0,47,16401,-14,-20,-18,26"
 
 CMD sed -i "s|PREFORK_CHILD .*|PREFORK_CHILD $(( 3 * $(nproc) / 2 ))|g"  $IROOT/ULib/benchmark.cfg && \

frameworks/C++/ulib/ulib-mysql.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ulib-base:latest
+FROM techempower/ulib-base:0.1
 
 # 1. Change ULib Server (userver_tcp) configuration
 RUN sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET -2|g" $IROOT/ULib/benchmark.cfg
@@ -8,7 +8,7 @@ RUN sed -i "s|CLIENT_FOR_PARALLELIZATION .*|CLIENT_FOR_PARALLELIZATION 100|g"  $
 # 2. Start ULib Server (userver_tcp)
 ENV ORM_DRIVER="mysql"
 ENV UMEMPOOL="581,0,0,59,16409,-7,-20,-23,31"
-ENV ORM_OPTION="host=TFB-database user=benchmarkdbuser password=benchmarkdbpass character-set=utf8 dbname=hello_world"
+ENV ORM_OPTION="host=tfb-database user=benchmarkdbuser password=benchmarkdbpass character-set=utf8 dbname=hello_world"
 
 CMD sed -i "s|PREFORK_CHILD .*|PREFORK_CHILD $(nproc)|g"  $IROOT/ULib/benchmark.cfg && \
     setcap cap_sys_nice,cap_sys_resource,cap_net_bind_service,cap_net_raw+eip  $IROOT/ULib/bin/userver_tcp && \

frameworks/C++/ulib/ulib-plaintext_fit.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ulib-base:latest
+FROM techempower/ulib-base:0.1
 
 # 1. Change ULib Server (userver_tcp) configuration
 RUN sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g" $IROOT/ULib/benchmark.cfg

frameworks/C++/ulib/ulib-postgres.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ulib-base:latest
+FROM techempower/ulib-base:0.1
 
 # 1. Change ULib Server (userver_tcp) configuration
 RUN sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET -2|g" $IROOT/ULib/benchmark.cfg
@@ -8,7 +8,7 @@ RUN sed -i "s|CLIENT_FOR_PARALLELIZATION .*|CLIENT_FOR_PARALLELIZATION 100|g"  $
 # 2. Start ULib Server (userver_tcp)
 ENV ORM_DRIVER="pgsql"
 ENV UMEMPOOL="581,0,0,59,16409,-7,-20,-23,31"
-ENV ORM_OPTION="host=TFB-database user=benchmarkdbuser password=benchmarkdbpass dbname=hello_world client_encoding=UTF8"
+ENV ORM_OPTION="host=tfb-database user=benchmarkdbuser password=benchmarkdbpass dbname=hello_world client_encoding=UTF8"
 
 CMD sed -i "s|PREFORK_CHILD .*|PREFORK_CHILD $(( 2 * $(nproc)))|g"  $IROOT/ULib/benchmark.cfg && \
     setcap cap_sys_nice,cap_sys_resource,cap_net_bind_service,cap_net_raw+eip  $IROOT/ULib/bin/userver_tcp && \

frameworks/C++/ulib/ulib-postgres_fit.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ulib-base:latest
+FROM techempower/ulib-base:0.1
 
 # 1. Change ULib Server (userver_tcp) configuration
 RUN sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET -2|g" $IROOT/ULib/benchmark.cfg
@@ -8,7 +8,7 @@ RUN sed -i "s|CLIENT_FOR_PARALLELIZATION .*|CLIENT_FOR_PARALLELIZATION 100|g"  $
 # 2. Start ULib Server (userver_tcp)
 ENV ORM_DRIVER="pgsql"
 ENV UMEMPOOL="581,0,0,59,16409,-7,-20,-23,31"
-ENV ORM_OPTION="host=TFB-database user=benchmarkdbuser password=benchmarkdbpass dbname=hello_world client_encoding=UTF8"
+ENV ORM_OPTION="host=tfb-database user=benchmarkdbuser password=benchmarkdbpass dbname=hello_world client_encoding=UTF8"
 
 CMD sed -i "s|PREFORK_CHILD .*|PREFORK_CHILD $(nproc)|g"  $IROOT/ULib/benchmark.cfg && \
     setcap cap_sys_nice,cap_sys_resource,cap_net_bind_service,cap_net_raw+eip  $IROOT/ULib/bin/userver_tcp && \

frameworks/C++/ulib/ulib.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ulib-base:latest
+FROM techempower/ulib-base:0.1
 
 # 1. Change ULib Server (userver_tcp) configuration
 RUN sed -i "s|TCP_LINGER_SET .*|TCP_LINGER_SET 0|g" $IROOT/ULib/benchmark.cfg

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

@@ -1,4 +1,4 @@
-FROM tfb/gcc-6:latest
+FROM techempower/gcc-6:0.1
 
 ENV WT_VERSION=4.0.2
 ENV BOOST_ROOT=${IROOT}/boost

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

@@ -1,4 +1,4 @@
-FROM tfb/wt-base:latest
+FROM techempower/wt-base:0.1
 
 COPY ./ ./
 
@@ -21,6 +21,6 @@ RUN g++-6 \
   -lpthread \
   -lpq
 
-ENV DBHOST=TFB-database
+ENV DBHOST=tfb-database
 
 CMD ./te-benchmark-pg.wt -c wt_config.xml -t $(nproc) --docroot . --approot . --http-listen 0.0.0.0:8080 --accesslog=- --no-compression

frameworks/C++/wt/wt.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/wt-base:latest
+FROM techempower/wt-base:0.1
 
 COPY ./ ./
 
@@ -20,6 +20,6 @@ RUN g++-6 \
   -lpthread \
   -lmysqlclient
 
-ENV DBHOST=TFB-database
+ENV DBHOST=tfb-database
 
 CMD ./te-benchmark.wt -c wt_config.xml -t $(nproc) --docroot . --approot . --http-listen 0.0.0.0:8080 --accesslog=- --no-compression

frameworks/C/duda/duda.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/base:latest
+FROM techempower/base:0.1
 
 RUN apt install git python -y
 

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

@@ -1,4 +1,4 @@
-FROM tfb/base:latest
+FROM techempower/base:0.1
 
 COPY ./ ./
 
@@ -18,4 +18,4 @@ RUN cp -f bench_app.c facil_app/src/app.c
 RUN cd facil_app && make -j build
 
 # Run the app
-CMD ./facil_app/tmp/demo -p 8080 -db "TFB-database" -w 4 -t -4
+CMD ./facil_app/tmp/demo -p 8080 -db "tfb-database" -w 4 -t -4

frameworks/C/h2o/h2o.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/ruby-2.4:latest
+FROM techempower/ruby-2.4:0.1
 
 COPY ./ ./
 

frameworks/C/h2o/start-servers.sh

@@ -38,7 +38,7 @@ run_curl()
 run_h2o_app()
 {
 	taskset -c "$1" "$2/h2o_app" -a20 -f "$3/template/fortunes.mustache" -m "$DB_CONN" "$4" "$5" \
-		-d "host=TFB-database dbname=hello_world user=benchmarkdbuser password=benchmarkdbpass" &
+		-d "host=tfb-database dbname=hello_world user=benchmarkdbuser password=benchmarkdbpass" &
 }
 
 generate_profile_data()

frameworks/C/libreactor/libreactor.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/gcc-6:latest
+FROM techempower/gcc-6:0.1
 
 COPY ./ ./
 

frameworks/C/octane/octane.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/base:latest
+FROM techempower/base:0.1
 
 COPY ./ ./
 

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], "TFB-database",
+		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

@@ -1,4 +1,4 @@
-FROM tfb/base:latest
+FROM techempower/base:0.1
 
 COPY ./ ./
 

frameworks/CSharp/aspnet/aspnet-base.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/mono:latest
+FROM techempower/mono:0.1
 
 ADD ./ /aspnet
 WORKDIR /aspnet

frameworks/CSharp/aspnet/aspnet-mono-jsonnet.dockerfile

@@ -1,2 +1,2 @@
-FROM tfb/aspnet-base:latest
+FROM techempower/aspnet-base:0.1
 CMD bash run.sh

frameworks/CSharp/aspnet/aspnet-mono-mysql-entityframework.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnet-base:latest
+FROM techempower/aspnet-base:0.1
+
 CMD bash run.sh

frameworks/CSharp/aspnet/aspnet-mono-mysql-raw.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnet-base:latest
+FROM techempower/aspnet-base:0.1
+
 CMD bash run.sh

frameworks/CSharp/aspnet/aspnet-mono-servicestack.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnet-base:latest
+FROM techempower/aspnet-base:0.1
+
 CMD bash run.sh

frameworks/CSharp/aspnet/aspnet.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnet-base:latest
+FROM techempower/aspnet-base:0.1
+
 CMD bash run.sh

frameworks/CSharp/aspnet/src/Web.config

@@ -6,10 +6,10 @@
   <!-- Connection Strings -->
   <!-- Names are case insensitive -->
   <connectionStrings>
-    <add name="MySQL" connectionString="server=TFB-database; user id=benchmarkdbuser; password=benchmarkdbpass; database=hello_world" providerName="MySql.Data.MySqlClient"/>
-    <add name="PostgreSQL" connectionString="server=TFB-database; user id=benchmarkdbuser; password=benchmarkdbpass; database=hello_world" providerName="Npgsql"/>
-    <add name="MongoDB" connectionString="mongodb://TFB-database"/>
-    <add name="SQLServer" connectionString="server=TFB-database; user id=benchmarkdbuser; password=B3nchmarkDBPass; database=hello_world" providerName="System.Data.SqlClient"/>
+    <add name="MySQL" connectionString="server=tfb-database; user id=benchmarkdbuser; password=benchmarkdbpass; database=hello_world" providerName="MySql.Data.MySqlClient"/>
+    <add name="PostgreSQL" connectionString="server=tfb-database; user id=benchmarkdbuser; password=benchmarkdbpass; database=hello_world" providerName="Npgsql"/>
+    <add name="MongoDB" connectionString="mongodb://tfb-database"/>
+    <add name="SQLServer" connectionString="server=tfb-database; user id=benchmarkdbuser; password=B3nchmarkDBPass; database=hello_world" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <!-- ADO.NET -->
   <system.data>

frameworks/CSharp/aspnetcore/Benchmarks/appsettings.postgresql.json

@@ -1,4 +1,4 @@
 {
-  "ConnectionString": "Server=TFB-database;Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=1024;NoResetOnClose=true;Max Auto Prepare=3",
+  "ConnectionString": "Server=tfb-database;Database=hello_world;User Id=benchmarkdbuser;Password=benchmarkdbpass;Maximum Pool Size=1024;NoResetOnClose=true;Max Auto Prepare=3",
   "Database": "postgresql"
-}
+}

frameworks/CSharp/aspnetcore/aspnetcore-base.dockerfile

@@ -1,4 +1,4 @@
-FROM tfb/base:latest
+FROM techempower/base:0.1
 
 ADD ./ /aspnetcore
 WORKDIR /aspnetcore

frameworks/CSharp/aspnetcore/aspnetcore-middleware-dapper.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnetcore-base:latest
+FROM techempower/aspnetcore-base:0.1
+
 CMD bash setup-dapper.sh

frameworks/CSharp/aspnetcore/aspnetcore-middleware-ef.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnetcore-base:latest
+FROM techempower/aspnetcore-base:0.1
+
 CMD bash setup-ef.sh

frameworks/CSharp/aspnetcore/aspnetcore-middleware-json.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnetcore-base:latest
+FROM techempower/aspnetcore-base:0.1
+
 CMD bash setup-json.sh

frameworks/CSharp/aspnetcore/aspnetcore-middleware-raw.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnetcore-base:latest
+FROM techempower/aspnetcore-base:0.1
+
 CMD bash setup-raw.sh

frameworks/CSharp/aspnetcore/aspnetcore-mvc-dapper.dockerfile

@@ -1,2 +1,2 @@
-FROM tfb/aspnetcore-base:latest
+FROM techempower/aspnetcore-base:0.1
 CMD bash setup-mvc-dapper.sh

frameworks/CSharp/aspnetcore/aspnetcore-mvc-ef.dockerfile

@@ -1,2 +1,2 @@
-FROM tfb/aspnetcore-base:latest
+FROM techempower/aspnetcore-base:0.1
 CMD bash setup-mvc-ef.sh

frameworks/CSharp/aspnetcore/aspnetcore-mvc-json.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnetcore-base:latest
+FROM techempower/aspnetcore-base:0.1
+
 CMD bash setup-mvc-json.sh

frameworks/CSharp/aspnetcore/aspnetcore-mvc-raw.dockerfile

@@ -1,2 +1,2 @@
-FROM tfb/aspnetcore-base:latest
+FROM techempower/aspnetcore-base:0.1
 CMD bash setup-mvc-raw.sh

frameworks/CSharp/aspnetcore/aspnetcore-mvc.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnetcore-base:latest
+FROM techempower/aspnetcore-base:0.1
+
 CMD bash setup-mvc-plaintext.sh

frameworks/CSharp/aspnetcore/aspnetcore.dockerfile

@@ -1,2 +1,3 @@
-FROM tfb/aspnetcore-base:latest
+FROM techempower/aspnetcore-base:0.1
+
 CMD bash setup-plaintext.sh