search

kartoza / gfdrr_oondra

GFDRR Challenge Online Operational Natural Disaster Risk Assessment platform
0 stars 3 forks source link

Merge oondra docker osm branch #51

Open gubuntu opened 7 years ago

gubuntu commented 7 years ago

Merge or otherwise manage the oondra-specific changes in https://github.com/rischanlab/docker-osm into a suitable place - they can't stay in your fork.

rischanlab commented 7 years ago

Hi @gubuntu I have updated the repo. Docker-osm stuff now available inside the gfdrr repo. Please see the develop branch of gfdrr repo https://github.com/kartoza/gfdrr_oondra/tree/develop Please merge develop branch to master branch if you agree.

Thank you

rischanlab commented 7 years ago

Hi @gubuntu May I merge the develop branch to master in gfdrr repo then close this issue?

Thank you

gubuntu commented 7 years ago

please check with @cchristelis what the best practice is for something like this. I'm sure it's not a good idea to merge from one repo into another. I think just the oondra-specific configs for docker-osm should be placed into the oondra deployment orchestration in the oondra repo.

rischanlab commented 7 years ago

Hi @gubuntu previously I was using approach which similar with this https://github.com/kartoza/docker-geosafe/tree/develop/src

And I use external link to linking db geonode to db osm because they came from difference docker-compose.yml. But that was not stable.

So, I just decide to make it in one compose-file, and I made it in one project Id -> https://github.com/kartoza/gfdrr_oondra/blob/develop/deployment/Makefile

It make us easier if we want to see all containers related with gfdrr just giving a command docker -ps | grep gfdrr

Maybe Christian has another idea..

Thank you.