Synced $output_dir usage

Author: motin

bin/show_comparison_table.php

@@ -4,16 +4,19 @@
 require __DIR__ . '/../libs/build_table.php';
 require __DIR__ . '/../libs/recalc_relative.php';
 
+$stack = getenv('stack') ? getenv('stack') : 'local';
+$output_dir = __DIR__ . '/../output/' . $stack;
+
 $list = [
     'cake-3.0',
     'symfony-2.6',
     'zf-2.4',
 ];
 
 system('git checkout master');
-$results_master = parse_results(__DIR__ . '/../output/results.hello_world.log');
+$results_master = parse_results($output_dir . '/results.hello_world.log');
 system('git checkout optimize');
-$results_optimize = parse_results(__DIR__ . '/../output/results.hello_world.log');
+$results_optimize = parse_results($output_dir . '/results.hello_world.log');
 //var_dump($results_master, $results_optimize);
 
 $is_fisrt = true;

bin/show_results_table.php

@@ -3,7 +3,10 @@
 require __DIR__ . '/../libs/parse_results.php';
 require __DIR__ . '/../libs/build_table.php';
 
-$results = parse_results(__DIR__ . '/../output/' . getenv('stack') . '/results.hello_world.log');
+$stack = getenv('stack') ? getenv('stack') : 'local';
+$output_dir = __DIR__ . '/../output/' . $stack;
+
+$results = parse_results($output_dir . '/results.hello_world.log');
 //var_dump($results);
 
 echo build_table($results);

docker/docker-compose.yml

@@ -19,7 +19,7 @@ php_5_6_4:
   ports:
     - "9000"
   environment:
-    STACK: 'docker_nginx_php_5_6_4'
+    stack: 'docker_nginx_php_5_6_4'
   working_dir: '/repo'
   command: "/stack/php/run-php-fpm.sh"
 
@@ -32,7 +32,7 @@ hhvm_3_10_1:
   ports:
     - "9000"
   environment:
-    STACK: 'docker_nginx_hhvm_3_10_1'
+    stack: 'docker_nginx_hhvm_3_10_1'
   working_dir: '/repo'
   command: "/stack/php/run-hhvm.sh"
 
@@ -45,7 +45,7 @@ php_7_0_0:
   ports:
     - "9000"
   environment:
-    STACK: 'docker_nginx_php_7_0_0'
+    stack: 'docker_nginx_php_7_0_0'
   working_dir: '/repo'
   command: "/stack/php/run-php-fpm-7.sh"
 

index.php

@@ -1,6 +1,7 @@
 <?php
 
-$stack = getenv('STACK') ? getenv('STACK') : 'local';
+$stack = getenv('stack') ? getenv('stack') : 'local';
+$output_dir = __DIR__ . '/output/' . $stack;
 $host = null;
 switch ($stack) {
     case 'local':
@@ -10,7 +11,6 @@
         $host = str_replace('docker_', '', $stack);
         break;
 };
-$output_dir = __DIR__ . '/output/' . $stack;
 
 Parse_Results: {
     require __DIR__ . '/libs/parse_results.php';