diff --git a/.travis.yml b/.travis.yml index 3ed4365c..18c3668c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ services: - docker install: - - pkill mysqld - docker-compose build - docker-compose up -d @@ -18,4 +17,11 @@ script: - docker-compose ps | grep -i redis-queue - docker-compose ps | grep -i redis-socketio - docker-compose ps | grep -i mariadb - # -python test.py + - 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 "bench get-app erpnext https://github.com/frappe/erpnext" + - docker exec -i frappe bash -c "bench --site site1.local install-app erpnext" + - docker exec -i -u root frappe bash -c "echo 127.0.0.1 site1.local >> /etc/hosts" + - docker exec -id frappe bash -c "bench start" + - echo 127.0.0.1 site1.local >> /etc/hosts + - python test.py diff --git a/frappe-bench/sites/common_site_config_docker.json b/frappe-bench/sites/common_site_config_docker.json index 11897e32..cdc9d198 100644 --- a/frappe-bench/sites/common_site_config_docker.json +++ b/frappe-bench/sites/common_site_config_docker.json @@ -15,5 +15,6 @@ "shallow_clone": true, "socketio_port": 9000, "update_bench_on_update": true, - "webserver_port": 8000 + "webserver_port": 8000, + "admin_password": "admin" } \ No newline at end of file diff --git a/test.py b/test.py new file mode 100644 index 00000000..5e1ee44f --- /dev/null +++ b/test.py @@ -0,0 +1,10 @@ +import subprocess,requests,time + +time.wait(45) + +try: + r = requests.get("site1.local:8000") + assert '