Преглед на файлове

Docker c++ poco (#3394)

* Docker c++ poco

* enable travis
Nate преди 7 години
родител
ревизия
2f95d48375

+ 1 - 1
.travis.yml

@@ -28,7 +28,7 @@ env:
      - "TESTDIR=C++/treefrog"
     # - "TESTDIR=C++/ulib"
      - "TESTDIR=C++/wt"
-    # - "TESTDIR=C++/poco"
+     - "TESTDIR=C++/poco"
     # - "TESTDIR=C++/luna"
      - "TESTDIR=Clojure/aleph"
      - "TESTDIR=Clojure/compojure"

+ 0 - 1
frameworks/C++/poco/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "poco",
   "tests": [{
     "default": {
-      "setup_file": "setup",
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",

+ 27 - 0
frameworks/C++/poco/poco.dockerfile

@@ -0,0 +1,27 @@
+FROM tfb/gcc-4.8:latest
+
+ENV IROOT=/install
+ENV VERSION=1.6.1
+ENV POCO_HOME=$IROOT/poco_$VERSION
+
+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 cp -R poco-$VERSION-all/ $POCO_HOME
+
+WORKDIR $POCO_HOME
+
+RUN ./configure --no-tests --no-samples
+RUN make --quiet PageCompiler-libexec XML-libexec JSON-libexec
+
+ENV LD_LIBRARY_PATH=$POCO_HOME/lib/Linux/x86_64
+
+COPY ./benchmark.cpp ./
+
+RUN  g++-4.8 -O3 -DNDEBUG -std=c++0x -o poco benchmark.cpp -I$POCO_HOME/Foundation/include -I$POCO_HOME/Util/include -I$POCO_HOME/Net/include -L$POCO_HOME/lib/Linux/x86_64 -lPocoNet -lPocoUtil -lPocoFoundation -lPocoXML -lPocoJSON
+
+CMD ./poco 8080 $CPU_COUNT

+ 0 - 7
frameworks/C++/poco/setup.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends poco
-
-g++-4.8 -O3 -DNDEBUG -std=c++0x -o poco benchmark.cpp -I$POCO_HOME/Foundation/include -I$POCO_HOME/Util/include -I$POCO_HOME/Net/include -L$POCO_HOME/lib/Linux/x86_64 -lPocoNet -lPocoUtil -lPocoFoundation -lPocoXML -lPocoJSON
-./poco 8080 $CPU_COUNT
-

+ 6 - 0
toolset/setup/docker/systools/gcc-4.8.dockerfile

@@ -0,0 +1,6 @@
+FROM tfb/base:latest
+
+RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
+RUN apt update -y
+RUN apt install -y g++-4.8
+RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50

+ 0 - 22
toolset/setup/linux/frameworks/poco.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-fw_installed poco && return 0
-
-VERSION=1.6.1
-POCO_HOME=$IROOT/poco_$VERSION
-
-fw_get -o poco_$VERSION.tar.gz http://pocoproject.org/releases/poco-$VERSION/poco-$VERSION-all.tar.gz
-fw_untar poco_$VERSION.tar.gz
-
-cp -R poco-$VERSION-all/ $POCO_HOME
-rm -rf poco-$VERSION-all/
-
-cd $POCO_HOME
-./configure --no-tests --no-samples
-make --quiet PageCompiler-libexec XML-libexec JSON-libexec
-
-echo "export POCO_HOME=${POCO_HOME}" > $IROOT/poco.installed
-echo "export LD_LIBRARY_PATH=$POCO_HOME/lib/Linux/x86_64" >> $IROOT/poco.installed 
-
-source $IROOT/poco.installed
-