Skip to content

Commit

Permalink
quick setup in readme and container name in docker-compose file
Browse files Browse the repository at this point in the history
  • Loading branch information
Gustry committed Aug 23, 2018
1 parent 7574303 commit 0f74c17
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 2 deletions.
1 change: 1 addition & 0 deletions docker-compose-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ services:
qgisserver:
image: kartoza/qgis-server:2.18
hostname: dockerosm_qgisserver
container_name: dockerosm_qgisserver
volumes:
- ./logs:/var/log/apache2
- ./web:/project
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
# About the postgresql version, it should match in the dockerfile of docker-imposm3
image: kartoza/postgis:9.6-2.4
hostname: db
container_name: dockerosm_db
environment:
- POSTGRES_USER=docker
- POSTGRES_PASS=docker
Expand All @@ -28,6 +29,7 @@ services:
imposm:
image: kartoza/docker-osm:imposm-latest
build: docker-imposm3
container_name: dockerosm_imposm
volumes:
# These are sharable to other containers
- ./settings:/home/settings
Expand Down Expand Up @@ -72,6 +74,7 @@ services:
osmupdate:
build: docker-osmupdate
image: kartoza/docker-osm:osmupdate-latest
container_name: dockerosm_osmupdate
volumes:
# These are sharable to other containers
- ./settings:/home/settings
Expand Down
2 changes: 1 addition & 1 deletion docker-imposm3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM golang:1.10
MAINTAINER Etienne Trimaille <etienne@kartoza.com>
MAINTAINER Etienne Trimaille <etienne.trimaille@gmail.com>

RUN apt update && apt install -y python3-pip \
libprotobuf-dev libleveldb-dev libgeos-dev \
Expand Down
2 changes: 1 addition & 1 deletion docker-osmupdate/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
FROM ubuntu:18.04
MAINTAINER Etienne Trimaille<etienne@kartoza.com>
MAINTAINER Etienne Trimaille<etienne.trimaille@gmail.com>

RUN export DEBIAN_FRONTEND=noninteractive
ENV DEBIAN_FRONTEND noninteractive
Expand Down
20 changes: 20 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,26 @@ A docker compose project to setup an OSM PostGIS database with automatic
updates from OSM periodically.
The only file you need is a PBF file and run the docker compose project.


## Quick setup

As a quick example, we are going to setup Docker-OSM with default values everywhere:
* Download a PBF file from http://download.geofabrik.de/
* Put the file in the `settings` folder.
* If you want to connect from your local QGIS Desktop:
* In the file `docker-compose.yml`, uncomment the block:

```yml
# Uncomment to use the postgis database from outside the docker network
ports:
- "35432:5432"
```
* Do `make run` in the build directory. This will download and execute the docker-osm project. It might be very long depending of your bandwidth and the PBF you are importing.
* In QGIS, add a new PostGIS connexion: `localhost`, database `gis`, port `35432`, `docker` for both username and password.
* That's it! You have a OSM database, up and running. The update is done every 2 minutes from the main OSM website.

For further reading and customizations, read below.

## Docker cloud

Dockerfiles are executed on https://cloud.docker.com
Expand Down

0 comments on commit 0f74c17

Please sign in to comment.