From 5a1c7d5806d287ed24638a335f581861d39b5bec Mon Sep 17 00:00:00 2001 From: Jonathan Budzenski Date: Mon, 18 Sep 2017 16:03:48 -0500 Subject: [PATCH] Bind mount build directory, used by functional tests --- tasks/build/docker/docker-compose.yml | 1 + tasks/build/index.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tasks/build/docker/docker-compose.yml b/tasks/build/docker/docker-compose.yml index e12c4a838e4297f..92c9d3176d96549 100644 --- a/tasks/build/docker/docker-compose.yml +++ b/tasks/build/docker/docker-compose.yml @@ -10,3 +10,4 @@ services: - node_version=$KIBANA_NODE_VERSION volumes: - $KIBANA_BUILD_CONTEXT/target:/home/kibana/repo/target + - $KIBANA_BUILD_CONTEXT/build:/home/kibana/repo/build diff --git a/tasks/build/index.js b/tasks/build/index.js index 84fd9cfeccd1b90..67710fc2bfc131a 100644 --- a/tasks/build/index.js +++ b/tasks/build/index.js @@ -47,9 +47,13 @@ module.exports = function (grunt) { }); const useCache = grunt.option('cache'); + const targetDir = join(grunt.config.get('root'), 'target'); + const buildDir = join(grunt.config.get('root'), 'build'); rimraf.sync(targetDir); + rimraf.sync(buildDir); mkdirp.sync(targetDir); + mkdirp.sync(buildDir); exec('docker-compose', [ '-f', composePath,