From cfc0e9c5a078997db416bdf6122163b12ed1f0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89douard=20Lopez?= Date: Wed, 4 Dec 2019 18:56:03 +0100 Subject: [PATCH 1/3] fix smartconfigparser install --- backend/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/requirements.txt b/backend/requirements.txt index db866ff..b0512b1 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,5 +1,5 @@ wheel -smartconfigparser==0.1.1 +https://github.com/guillaumevincent/smartconfigparser/archive/0.1.1.zip Django==1.9.6 djangorestframework==3.6.1 djangorestframework-jwt==1.8.0 From 30a3617bd431a46710bbfb367364381545acdbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89douard=20Lopez?= Date: Wed, 4 Dec 2019 18:56:19 +0100 Subject: [PATCH 2/3] fix frontoffice ip detection mechanism --- makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 6a6b335..96138f2 100644 --- a/makefile +++ b/makefile @@ -64,9 +64,9 @@ reset-test-env: docker network prune --force where-is-front-office: - frontoffice_ip="$$(docker inspect coaxisopt_daemon_1 --format "{{ json .NetworkSettings.Networks.coaxisopt_default.IPAddress }}" | python -m json.tool | sed -s 's/"//g')" \ + frontoffice_ip="$$(docker inspect coaxis-opt_daemon_1 --format '{{ $$network := index .NetworkSettings.Networks "coaxis-opt_default" }}{{ $$network.IPAddress}}')" \ && echo "Front-office → http://$$frontoffice_ip/" - echo + @echo dev: reset-test-env prepare-env where-is-front-office echo "Back-office → http://localhost/" From ffc62c905be8de11d7552e26a7a71ac32a2473e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89douard=20Lopez?= Date: Wed, 4 Dec 2019 19:15:47 +0100 Subject: [PATCH 3/3] update install instructions --- README.md | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 3cf954a..f91e88a 100644 --- a/README.md +++ b/README.md @@ -85,20 +85,27 @@ For the host system we recommend **Debian-based** OS, other distribution are not * `docker-compose` `≥1.7.0`; * `Python` `≥3.5`. -### Installation +### Install (for Development) -From developer computer, run: +See [docs/how-to-develop.md](docs/how-to-develop.md). + +First configure the network interface to use, _e.g._ `wlp4s0`: + + $ export DEFAULT_INTERFACE=${interface:=wlp4s0} + +Then build and up containers: + + $ make dev + +If that's your first run, you will need to setup a [dabatase user](backend/README.md) + + $ make first-run - $ cd frontend/ - $ npm run build - $ cd ../deploy/ - $ archive="$(./create_archive.sh | tail -n 1)" - $ ./send-scripts.sh "$archive" - If you need to setup a python environment, please have a look at our short [Python and virtualenv doc](./docs/how-to-python-and-virtualenv.md). -### Development -See [docs/how-to-develop.md](docs/how-to-develop.md). +### Install (for Production) + +Check [deploy/README.md](deploy/README.md). ### Glossary