docker cpoll_cppsp (#3469)

.travis.yml

@@ -19,7 +19,7 @@ env:
      - "TESTDIR=CSharp/servicestack"
     # - "TESTDIR=C++/cppcms"
     # - "TESTDIR=C++/ffead-cpp"
-    # - "TESTDIR=C++/cpoll_cppsp"
+     - "TESTDIR=C++/cpoll_cppsp"
      - "TESTDIR=C++/cutelyst"
      - "TESTDIR=C++/silicon"
      - "TESTDIR=C++/treefrog"

frameworks/C++/cpoll_cppsp/.gitignore

@@ -1,2 +0,0 @@
-/www/*.so
-/www/*.txt

frameworks/C++/cpoll_cppsp/Makefile

@@ -3,7 +3,7 @@ all: cppsp_0.2.3
 clean:
 	rm -f www/*.so www/*.txt
 	rm -f www/forcedynamic.cppsm.*
-	$(MAKE) -C $(IROOT)/cppsp_0.2.3 clean
+	$(MAKE) -C /installs/cppsp_0.2.3 clean
 
 cppsp_0.2.3:
-	$(MAKE) -C $(IROOT)/cppsp_0.2.3 all
+	$(MAKE) -C /installs/cppsp_0.2.3 all

frameworks/C++/cpoll_cppsp/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "cpoll_cppsp",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 16969,
@@ -22,7 +21,6 @@
       "versus": "cpoll_cppsp"
     },
     "raw": {
-      "setup_file": "setup_mysql",
       "db_url": "/db",
       "query_url": "/db?queries=",
       "fortune_url": "/fortune",
@@ -44,7 +42,6 @@
       "versus": "cpoll_cppsp"
     },
     "postgres-raw": {
-      "setup_file": "setup_postgresql",
       "db_url": "/db_pg_async",
       "query_url": "/db_pg_async?queries=", 
       "port": 16969,
@@ -64,7 +61,6 @@
       "versus": "cpoll_cppsp"
     },
     "postgres-raw-threadpool": {
-      "setup_file": "setup_postgresql",
       "db_url": "/db_pg_threadpool",
       "query_url": "/db_pg_threadpool?queries=", 
       "port": 16969,

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

@@ -0,0 +1,24 @@
+FROM tfb/gcc-4.8:latest
+
+WORKDIR /installs
+
+ENV VERSION=0.2.3
+ENV CPPSP_HOME=/installs/cppsp_$VERSION
+
+RUN wget -q http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_$VERSION.tar.xz
+RUN tar xf cppsp_$VERSION.tar.xz
+
+RUN mv cppsp_rel$VERSION/ $CPPSP_HOME
+
+RUN sed -i 's|CXX := .*|CXX := g++-4.8|g' $CPPSP_HOME/makefile
+RUN sed -i 's|-Wall|-w|g' $CPPSP_HOME/makefile
+
+RUN apt install -yqq postgresql-server-dev-9.5
+ENV CPLUS_INCLUDE_PATH=/usr/include/postgresql:/usr/include/postgresql/9.5/server:${CPLUS_INCLUDE_PATH}
+
+ADD ./ /cpoll_cppsp
+WORKDIR /cpoll_cppsp
+
+RUN make clean && make
+
+WORKDIR $CPPSP_HOME

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

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

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

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

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

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

frameworks/C++/cpoll_cppsp/cpoll_cppsp.dockerfile

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

frameworks/C++/cpoll_cppsp/setup.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql-server-dev-9.3 cppsp
-
-make clean
-make
-cd $CPPSP_HOME
-./run_application $TROOT/www -g g++-4.8 -m /forcedynamic.cppsm &

frameworks/C++/cpoll_cppsp/setup_mysql.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends mysql
-
-source ./setup.sh

frameworks/C++/cpoll_cppsp/setup_postgresql.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-fw_depends postgresql
-
-source ./setup.sh

toolset/setup/linux/frameworks/cppsp.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-fw_installed cppsp && return 0
-
-VERSION=0.2.3
-CPPSP_HOME=$IROOT/cppsp_$VERSION
-
-fw_get -o cppsp_$VERSION.tar.xz http://downloads.sourceforge.net/project/cpollcppsp/CPPSP%200.2%20%28testing%29/cppsp_$VERSION.tar.xz
-fw_untar cppsp_$VERSION.tar.xz
-
-# Using cp+rm over mv intentionally, because apparently this download
-# causes oddball issues when mv'ed around inside a folder mounted 
-# inside of VirtualBox (may have something to do with case-sensitive 
-# filesystems)
-cp -R cppsp_rel$VERSION/ $CPPSP_HOME
-rm -rf cppsp_rel$VERSION/
-
-sed -i 's|CXX := .*|CXX := g++-4.8|g' $CPPSP_HOME/makefile
-sed -i 's|-Wall|-w|g' $CPPSP_HOME/makefile
-
-echo "export CPPSP_HOME=${CPPSP_HOME}" > $IROOT/cppsp.installed
-echo -e "export CPLUS_INCLUDE_PATH=/usr/include/postgresql:/usr/include/postgresql/9.3/server:\$CPLUS_INCLUDE_PATH" >> $IROOT/cppsp.installed
-
-source $IROOT/cppsp.installed