From ddede9b5a40d270f007cec49edc6e5f8bef80ad0 Mon Sep 17 00:00:00 2001 From: chabad360 Date: Wed, 1 Aug 2018 12:48:21 -0700 Subject: [PATCH] revert --- .travis.yml | 2 +- Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c78c5e5..bf15e5f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ 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 --skip-bench-mkdir --skip-redis-config-generation && cd frappe-bench" + - 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" diff --git a/Dockerfile b/Dockerfile index 7f5b9a14..4bdf8885 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ - + #bench Dockerfile FROM ubuntu:16.04 @@ -38,6 +38,7 @@ RUN pip install -e bench-repo RUN apt-get install -y libmysqlclient-dev mariadb-client mariadb-common RUN npm install -g yarn RUN chown -R frappe:frappe /home/frappe/* +ENV PATH /home/frappe/.local/bin USER frappe WORKDIR /home/frappe/frappe-bench