From 3546d01053fd4528b43d1975f6935d31c7fb11ec Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 16:04:33 -0700 Subject: [PATCH] fixing dbench and removing cache, its not worth it --- .travis.yml | 9 +-------- dbench | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2c01dfd..7b1caf81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,7 @@ services: - docker install: - - if [[ -e ~/docker/image.tar ]]; then docker load -i ~/docker/image.tar; fi - docker-compose build - - mkdir -p ~/docker; docker save frappedocker_frappe > ~/docker/image.tar - docker-compose up -d - ./dbench init -d - pip install --upgrade virtualenv @@ -29,9 +27,4 @@ script: - docker-compose ps | grep -i redis-socketio - docker-compose ps | grep -i mariadb - python test.py - - docker-compose stop - - -cache: - directories: - - ~/docker \ No newline at end of file + - docker-compose stop \ No newline at end of file diff --git a/dbench b/dbench index 2d5622dd..19d3c163 100755 --- a/dbench +++ b/dbench @@ -40,7 +40,7 @@ then elif [[ $1 == 'init' && $2 == 'd' ]] then frappe_installer - cat frappe-bench/sites/site1/site_config.json + docker exec -it frappe bash -c "cat frappe-bench/sites/site1/site_config.json" elif [ $1 == 'init' ] then