epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-22 15:55:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fixes and tests

Browse source 
fixed travis test, and perm issue
This commit is contained in:
chabad360 2018-10-05 04:30:13 +00:00
parent 19021a820b
commit 93cd0d6ac7
2 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.travis.yml
View file

@ -8,10 +8,11 @@ services:
- docker - docker
install: install:
- docker-compose up -d - chmod ugo+x ./bench
- ./bench setup docker
- ./bench init frappe-bench - ./bench init frappe-bench
- ./bench new-site site1.local - ./bench new-site site1.local
- ./bench -c "echo 127.0.0.1 site1.local >> /etc/hosts" - ./bench -c root "echo 127.0.0.1 site1.local >> /etc/hosts"
- sudo su -c 'echo 127.0.0.1 site1.local >> /etc/hosts' - sudo su -c 'echo 127.0.0.1 site1.local >> /etc/hosts'
- pip install --upgrade virtualenv - pip install --upgrade virtualenv
- virtualenv -p python3 testenv - virtualenv -p python3 testenv

14
bench
View file

@ -1,9 +1,11 @@
#!/bin/bash #!/bin/bash
if [ "$1" == 'init' ]; then if [[ $# -eq 0 ]]; then
docker exec -it frappe bash
elif [ "$1" == 'init' ]; then
docker exec -it root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*" docker exec -it root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
docker exec -it frappe bash -c "bench init frappe-bench --ignore-exist --skip-redis-config-generation && mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json && bench set-mariadb-host mariadb" docker exec -it frappe bash -c "bench init frappe-bench --ignore-exist --skip-redis-config-generation && mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json && bench set-mariadb-host mariadb"
elif [ "$1" == 'setup' && "$2" == 'docker' ]; then elif [ "$1" == 'setup' ] && [ "$2" == 'docker' ]; then
if [ "$3" == 'swarm' ]; then if [ "$3" == 'swarm' ]; then
echo "Docker swarm mode is not currently supported" echo "Docker swarm mode is not currently supported"
else else
@ -11,9 +13,9 @@ elif [ "$1" == 'setup' && "$2" == 'docker' ]; then
fi fi
elif [ "$1" == '-c' ]; then elif [ "$1" == '-c' ]; then
shift shift
docker exec -it root frappe bash -c "$@" user=$1
elif [[ $# -eq 0 ]]; then shift
docker exec -it frappe bash docker exec -it -u "$user" frappe bash -c "$@"
else else
docker exec -it frappe bash -c "bench $@" docker exec -it frappe bash -c bench "$@"
fi fi