remove docker_files need (#3465)

frameworks/Dart/start/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "start",
   "tests": [{
     "default": {
-      "docker_files": ["start-nginx.dockerfile"],
       "db_url": "/db-mongo",
       "query_url": "/queries-mongo?queries=",
       "fortune_url": "/fortunes-mongo",

frameworks/Dart/start/nginx-conf.sh

@@ -3,8 +3,9 @@
 #
 # create nginx configuration
 #
+conf+="user root;\n"
 conf+="worker_processes ${CPU_COUNT};\n"
-conf+="error_log /dev/null error;\n"
+conf+="error_log stderr;\n"
 conf+="events {\n"
 conf+="\tworker_connections 1024;\n"
 conf+="}\n"

frameworks/Dart/start/start-nginx.dockerfile

@@ -1,8 +0,0 @@
-FROM tfb/nginx:latest
-
-COPY ./ ./
-
-RUN chmod a+rwx nginx-conf.sh
-RUN ./nginx-conf.sh
-
-CMD ["nginx", "-c", "/nginx.conf", "-g", "daemon off;"]

frameworks/Dart/start/start-servers.sh

@@ -9,6 +9,3 @@ while [ $current -lt $end ]; do
   dart server.dart -a 127.0.0.1 -p $current -d ${CPU_COUNT} &
   let current=current+1
 done
-
-wait
-

frameworks/Dart/start/start.dockerfile

@@ -1,9 +1,19 @@
+FROM tfb/nginx:latest
+
 FROM tfb/dart-lang:latest
 
-COPY ./ ./
+COPY --from=0 /nginx /nginx
+
+ENV NGINX_HOME="/nginx"
+ENV PATH=/nginx/sbin:${PATH}
+
+ADD ./ /start
+WORKDIR /start
 
 RUN pub upgrade
 
-RUN chmod a+rwx start-servers.sh
+RUN chmod -R 777 /start
+
+RUN ./nginx-conf.sh
 
-CMD ["./start-servers.sh"]
+CMD  ./start-servers.sh && sleep 20 && nginx -c /start/nginx.conf -g "daemon off;"

frameworks/Dart/stream/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "stream",
   "tests": [{
      "default": {
-       "docker_files": ["stream-nginx.dockerfile"],
        "db_url": "/db-mongo",
        "query_url": "/queries-mongo?queries=",
        "fortune_url": "/fortunes-mongo",

frameworks/Dart/stream/nginx-conf.sh

@@ -3,8 +3,9 @@
 #
 # create nginx configuration
 #
+conf+="user root;\n"
 conf+="worker_processes ${CPU_COUNT};\n"
-conf+="error_log /dev/null error;\n"
+conf+="error_log stderr;\n"
 conf+="events {\n"
 conf+="\tworker_connections 1024;\n"
 conf+="}\n"

frameworks/Dart/stream/start-servers.sh

@@ -9,6 +9,3 @@ while [ $current -lt $end ]; do
   dart server.dart -a 127.0.0.1 -p $current -d ${CPU_COUNT} &
   let current=current+1
 done
-
-wait
-

frameworks/Dart/stream/stream-nginx.dockerfile

@@ -1,8 +0,0 @@
-FROM tfb/nginx:latest
-
-COPY ./ ./
-
-RUN chmod a+rwx nginx-conf.sh
-RUN ./nginx-conf.sh
-
-CMD ["nginx", "-c", "/nginx.conf", "-g", "daemon off;"]

frameworks/Dart/stream/stream.dockerfile

@@ -1,9 +1,19 @@
+FROM tfb/nginx:latest
+
 FROM tfb/dart-lang:latest
 
-COPY ./ ./
+COPY --from=0 /nginx /nginx
+
+ENV NGINX_HOME="/nginx"
+ENV PATH=/nginx/sbin:${PATH}
+
+ADD ./ /stream
+WORKDIR /stream
 
 RUN pub upgrade
 
-RUN chmod a+rwx start-servers.sh
+RUN chmod -R 777 /stream
+
+RUN ./nginx-conf.sh
 
-CMD ["./start-servers.sh"]
+CMD  ./start-servers.sh && sleep 20 && nginx -c /stream/nginx.conf -g "daemon off;"

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

@@ -5,4 +5,4 @@ RUN wget http://storage.googleapis.com/dart-archive/channels/stable/release/4539
 RUN unzip dartsdk-linux-x64-release.zip
 
 ENV PUB_CACHE=/.pubcache
-ENV PATH=dart-sdk/bin:${PATH}
+ENV PATH=/dart-sdk/bin:${PATH}