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 888eb3fd..65145f3f 100644 --- a/frappe-bench/sites/common_site_config_docker.json +++ b/frappe-bench/sites/common_site_config_docker.json @@ -1,19 +1,20 @@ { - "auto_update": false, - "background_workers": 1, - "db_host": "mariadb", - "file_watcher_port": 6787, - "frappe_user": "frappe", - "gunicorn_workers": 4, - "rebase_on_pull": false, - "redis_cache": "redis://redis-cache:13000", - "redis_queue": "redis://redis-queue:11000", - "redis_socketio": "redis://redis-socketio:12000", - "restart_supervisor_on_update": false, - "root_password": "123", - "serve_default_site": true, - "shallow_clone": true, - "socketio_port": 9000, - "update_bench_on_update": true, - "webserver_port": 8000 -} \ No newline at end of file + "auto_update": false, + "background_workers": 1, + "db_host": "mariadb", + "file_watcher_port": 6787, + "frappe_user": "frappe", + "gunicorn_workers": 4, + "rebase_on_pull": false, + "redis_cache": "redis://redis-cache:13000", + "redis_queue": "redis://redis-queue:11000", + "redis_socketio": "redis://redis-socketio:12000", + "restart_supervisor_on_update": false, + "root_password": "123", + "serve_default_site": true, + "shallow_clone": true, + "socketio_port": 9000, + "update_bench_on_update": true, + "webserver_port": 8000, + "admin_password": "admin" +} 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 '