Merge pull request GeoNode#90 from JivanAmara/docker-dev

Since postgres only needs a single superuser, eliminate postgres init in lieu of image env vars.
JivanAmara · Jan 6, 2017 · d284dc1 · d284dc1
2 parents 369b9f7 + 5d7a9fa
commit d284dc1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/scripts/docker-dev/docker-compose.yaml b/scripts/docker-dev/docker-compose.yaml
@@ -1,8 +1,11 @@
 version: '2'
 services:
   postgres:
-    build: "postgres-postgis/"
-    image: "postgresql-postgis:9.3-2.3"
+    image: mdillon/postgis:9.3
+    environment:
+     - POSTGRES_USER=osgeo
+     - POSTGRES_PASSWORD=osgeo
+     - POSTGRES_DB=osgeo
     ports:
      - "5432:5432"
     expose:

diff --git a/scripts/docker-dev/postgres-postgis/Dockerfile b/scripts/docker-dev/postgres-postgis/Dockerfile
diff --git a/scripts/docker-dev/postgres-postgis/init-user-db.sh b/scripts/docker-dev/postgres-postgis/init-user-db.sh