diff --git a/Makefile b/Makefile index 4ab42e7..c140f9f 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,12 @@ GEONATURE_CITIZEN_TAG = 0.99.1-dev .PHONY: start init dev +all: + echo "please specify target" + dev: init - docker image inspect geonature >/dev/null 2>&1 || docker build vendor/GeoNature-citizen -t geonature - docker container inspect geonature >/dev/null 2>&1 || (\ - docker run -it -d -p 8080:80 --name geonature geonature &&\ - docker cp patches/settings.ini geonature:config &&\ - docker cp patches/start.sh geonature:. &&\ - #docker cp patches/install_app.sh geonature:install/ &&\ - #docker cp patches/models.py geonature:backend/gncitizen/core/taxonomy/ &&\ - #docker cp patches/tsconfig.server.json geonature:frontend/src/ &&\ - docker exec -it geonature install/install_app.sh) + docker-compose up -d + docker-compose exec citizen install/install_app.sh xdg-open http://localhost:8080 init: vendor/GeoNature-citizen @@ -27,6 +23,7 @@ doc: xdg-open $(shell pwd)/vendor/GeoNature-citizen/docs/_build/html/index.html clean: - docker stop geonature - docker rm geonature + docker stop biommap_citizen + docker rm biommap_citien + docker inspect -f '{{ .Mounts }}' biommap_citizen_1 docker volume prune diff --git a/README b/README index 3bdca0c..170ade7 100644 --- a/README +++ b/README @@ -4,9 +4,9 @@ L'instance Geonature-Citizen de Champs-Libres. Installation développeur : + $ git submodule update --init --recursive $ docker-compose up -d - $ docker exec biommap_geonature_1 install/install_app.sh - $ docker attach biommap_geonature_1 + $ docker-compose exec citizen install/install_app.sh note: les credentials pour accéder au backend se trouvent dans /home/appuser/citizen/config