diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e9ce555f --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/frappe-bench/**/* +!/frappe-bench/Procfile_docker +!/frappe-bench/sites/common_site_config_docker.json diff --git a/.travis.yml b/.travis.yml index 6c78c5e5..622e7742 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ install: - 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 "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json" + - docker exec -i frappe bash -c "cp Procfile_docker Procfile && cp 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/dbench b/dbench index 9bf58b81..be62903f 100755 --- a/dbench +++ b/dbench @@ -16,9 +16,9 @@ if [[ $# -eq 0 ]]; then elif [ $1 == 'init' ] then - docker exec -i -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*" + docker exec -i -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*" docker exec -it frappe bash -c "cd .. && bench init frappe-bench --skip-bench-mkdir --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 frappe bash -c "cp Procfile_docker Procfile && cp 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"