Merge branch 'master' of github.com:ezsystems/launchpad

ezecosystem · Mar 24, 2018 · caf0fe3 · caf0fe3
2 parents cbe3062 + 515ff61
commit caf0fe3
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 1 deletion.
diff --git a/docs/ez.phar b/docs/ez.phar
diff --git a/docs/ez.phar.version b/docs/ez.phar.version
@@ -1 +1 @@
-91a16f593c652777ae82d14b9cd9247068bcfbc1  ez.phar
+8e4cbf16b309c3cb5cf9ef251ba5ec8f2625f47f  ez.phar
diff --git a/payload/dev/solr/entrypoint.bash b/payload/dev/solr/entrypoint.bash
@@ -5,6 +5,7 @@ if [ ! -f /ezsolr/server/ez/solr.xml ]; then
     cp /opt/solr/server/solr/solr.xml /ezsolr/server/ez
     cp /opt/solr/server/solr/configsets/basic_configs/conf/{currency.xml,solrconfig.xml,stopwords.txt,synonyms.txt,elevate.xml} /ezsolr/server/ez/template
     sed -i.bak '/<updateRequestProcessorChain name="add-unknown-fields-to-the-schema">/,/<\/updateRequestProcessorChain>/d' /ezsolr/server/ez/template/solrconfig.xml
+    sed -i -e 's/<maxTime>${solr.autoSoftCommit.maxTime:-1}<\/maxTime>/<maxTime>${solr.autoSoftCommit.maxTime:20}<\/maxTime>/g' /ezsolr/server/ez/template/solrconfig.xml
 fi
 
 /opt/solr/bin/solr -s /ezsolr/server/ez -f

diff --git a/src/Core/Client/Docker.php b/src/Core/Client/Docker.php
@@ -328,6 +328,7 @@ public function getComposeEnvVariables()
                 'DOCKER_HOST'             => getenv('DOCKER_HOST'),
                 'DOCKER_CERT_PATH'        => getenv('DOCKER_CERT_PATH'),
                 'DOCKER_TLS_VERIFY'       => getenv('DOCKER_TLS_VERIFY'),
+                'PATH'                    => getenv('PATH')
             ];
     }
 

diff --git a/src/Core/Client/DockerSync.php b/src/Core/Client/DockerSync.php
@@ -136,6 +136,7 @@ public function getEnvVariables()
                 'PROVISIONINGFOLDERNAME' => $this->getProvisioningFolderName(),
                 'COMPOSEFILE'            => $this->getComposeFileName(),
                 'HOME'                   => getenv('HOME'),
+                'PATH'                    => getenv('PATH')
             ];
     }
 

diff --git a/tests/Tests/Unit/TestCase.php b/tests/Tests/Unit/TestCase.php
@@ -169,6 +169,7 @@ public function getDockerClientEnvironmentVariables()
             'DOCKER_HOST'             => getenv('DOCKER_HOST'),
             'DOCKER_CERT_PATH'        => getenv('DOCKER_CERT_PATH'),
             'DOCKER_TLS_VERIFY'       => getenv('DOCKER_TLS_VERIFY'),
+            'PATH'                    => getenv('PATH'),
         ];
     }
 }