From 5555b588e6cfe844941e9de2a9bbd61b72e0e150 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 14:06:26 -0700 Subject: [PATCH] moving travis to dbench and fixing some dbench issues --- .travis.yml | 7 +------ dbench | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72c39650..f4ea2754 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,7 @@ services: install: - docker-compose build - docker-compose up -d - - docker exec -it -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*" - - docker exec -i frappe bash -c "cd .. && bench init frappe-bench --ignore-exist --skip-redis-config-generation && cd frappe-bench" - - docker exec -i frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json" - - docker exec -i frappe bash -c "bench new-site site1.local" - - docker exec -i -u root frappe bash -c "echo 127.0.0.1 site1.local >> /etc/hosts" - - sudo su -c 'echo 127.0.0.1 site1.local >> /etc/hosts' + - ./dbench - pip install --upgrade virtualenv - virtualenv -p python3 testenv - source testenv/bin/activate diff --git a/dbench b/dbench index 8731cf97..1fc0560d 100755 --- a/dbench +++ b/dbench @@ -20,8 +20,9 @@ then docker exec -it frappe bash -c "cd .. && bench init frappe-bench --ignore-exist --skip-redis-config-generation && cd frappe-bench" docker exec -it frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json" docker exec -it -u root frappe bash -c "apt-get install vim && apt-get install sudo && usermod -aG sudo frappe && printf '# User rules for frappe\nfrappe ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/frappe" - docker exec -it frappe bash -c "bench set-mariadb-host mariadb" docker exec -it frappe bash -c "bench new-site site1.local" + docker exec -i -u root frappe bash -c "echo 127.0.0.1 site1.local >> /etc/hosts" + sudo su -c 'echo 127.0.0.1 site1.local >> /etc/hosts' docker exec -it frappe bash -c "bench get-app erpnext" docker exec -it frappe bash -c "bench --site site1.local install-app erpnext"