diff --git a/.gitmodules b/.gitmodules index 2d2343f..4bbf277 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,9 +3,12 @@ url = https://github.com/kartoza/gwml2.git [submodule "geonode"] path = geonode - url = git@github.com:kartoza/geonode.git + url = https://github.com/kartoza/geonode.git + # url = git@github.com:kartoza/geonode.git branch = 4.1.1.igrac [submodule "istsos2"] path = istsos2 - url = git@github.com:meomancer/istsos2.git + url = https://github.com/meomancer/istsos2.git + # url = git@github.com:meomancer/istsos2.git branch = igrac + diff --git a/README.md b/README.md index 914cdb6..9395ae4 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,11 @@ ``` git clone https://github.com/kartoza/IGRAC-GGIS.git -cd IGRAC-GGIS/deployment -make build -make up -make collectstatic +cd IGRAC-GGIS +git submodule init +git submodule update +cd deployment +make deploy ``` The web will be available at `http://localhost/` diff --git a/deployment/Makefile b/deployment/Makefile index 23ec0be..d474153 100644 --- a/deployment/Makefile +++ b/deployment/Makefile @@ -131,7 +131,7 @@ collectstatic: #We need to run collect static in the same context as the running # django container it seems so I use docker exec here # no -it flag so we can run over remote shell - @docker exec $(PROJECT_ID)_django_1 python manage.py collectstatic --noinput + @docker exec $(PROJECT_ID)-django-1 python manage.py collectstatic --noinput versioning: @echo @@ -146,7 +146,7 @@ reload: @echo "Reload django project in production mode" @echo "------------------------------------------------------------------" # no -it flag so we can run over remote shell - @docker exec $(PROJECT_ID)_django_1 django --reload /tmp/django.pid + @docker exec $(PROJECT_ID)-django-1 django --reload /tmp/django.pid migrate: @echo