diff --git a/.gitignore b/.gitignore index af5d2bd..87883dd 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,5 @@ django_project/media # OSX Crap deployment/backups deployment/data_dir +deployment/geoserver_data +deployment/geoserver-data diff --git a/README.md b/README.md index 1b94b02..7b701ea 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,12 @@ You should write some docs, it's good for the soul. # Docker installation ## Install docker -This will install an Haitidata container +Follow the instructions from: +https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/#install-docker-ce -Makes sure to have docker-compose installed -``` -sudo apt-get install python-pip -sudo pip install docker-compose -``` +## Install docker-compose +Follow the instructions from: +https://docs.docker.com/compose/install/#install-compose ## Get project code Clone the repo: @@ -24,7 +23,7 @@ Run the docker container: ``` cd deployment make deploy -make update-migrations-localization: +make update-migrations-localization ``` -then you can visit http://0.0.0.0:33300``` +then you can visit http://0.0.0.0:33300 diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml index 82617ef..956362a 100644 --- a/deployment/docker-compose.yml +++ b/deployment/docker-compose.yml @@ -4,9 +4,8 @@ services: postgres: # Note you cannot scale if you use conteiner_name container_name: haitidata-postgres - image: kartoza/postgis:9.4-2.1 + image: kartoza/geonode_db volumes: - - ./pg/postgres_data:/var/lib/postgresql - ./backups:/backups environment: - USERNAME=docker @@ -123,7 +122,7 @@ services: links: - postgres volumes: - - /geoserver-data:/geoserver_data/data + - ./geoserver-data:/geoserver_data/data environment: - DOCKER_HOST - PUBLIC_PORT=80