diff --git a/.travis.yml b/.travis.yml index 2558893a..72c39650 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,9 @@ services: install: - docker-compose build - docker-compose up -d - - docker exec -i frappe bash -c "ls" - - docker exec -i frappe bash -c "bench init frappe-bench" - - docker exec -i frappe bash -c "mv frappe-site/Procfile_docker frappe-bench/Procfile && mv frappe-site/sites/common_site_config_docker.json frappe-bench/sites/common_site_config.json" - - docker exec -i frappe bash -c "cd frappe-bench" + - 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' diff --git a/Dockerfile b/Dockerfile index 9627063d..a212e88e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ - + #bench Dockerfile FROM ubuntu:16.04 @@ -30,6 +30,9 @@ RUN curl https://deb.nodesource.com/node_6.x/pool/main/n/nodejs/nodejs_6.7.0-1no RUN apt-get install -y wkhtmltopdf 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/