2
0
mirror of https://github.com/frappe/frappe_docker.git synced 2024-11-08 22:31:07 +00:00

Merge pull request #20 from frappe/develop

merge develop into master
This commit is contained in:
vishalseshagiri 2017-11-27 12:46:04 +05:30 committed by GitHub
commit b1c218e0b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

6
dbench
View File

@ -21,9 +21,9 @@ then
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 "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 -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 set-mariadb-host mariadb"
docker exec -it frappe bash -c "bench new-site bench-manager.local" docker exec -it frappe bash -c "bench new-site site1.local"
docker exec -it frappe bash -c "bench get-app bench_manager https://github.com/frappe/bench_manager" docker exec -it frappe bash -c "bench get-app erpnext"
docker exec -it frappe bash -c "bench --site bench-manager.local install-app bench_manager" docker exec -it frappe bash -c "bench --site site1.local install-app erpnext"
else else
while getopts ':hsc:' option; do while getopts ':hsc:' option; do

View File

@ -8,7 +8,7 @@ services:
volumes: volumes:
- ./conf/mariadb-conf.d:/etc/mysql/conf.d - ./conf/mariadb-conf.d:/etc/mysql/conf.d
ports: ports:
- "3307:3307" #mariadb-port - "3307:3306" #mariadb-port
container_name: mariadb container_name: mariadb
redis-cache: redis-cache: