Docker: switch to the C2C official postgres image (#2275)

camptocamp · Jun 2, 2016 · aeabc3c · aeabc3c
1 parent 0af0588
commit aeabc3c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/c2cgeoportal/scaffolds/create/+dot+gitignore_tmpl b/c2cgeoportal/scaffolds/create/+dot+gitignore_tmpl
@@ -28,7 +28,9 @@
 /mapserver/demo.map
 /mapserver/tinyows.xml
 /mapserver/replace_db.sh
-/testDB/01-schemas.sql
+/testDB/11-schemas.sql
+/testDB/12-alembic.sql
+/testDB/13-alembic-static.sql
 /testDB/Dockerfile
 /deploy/hooks/pre-restore-database
 /{{package}}/version.py

diff --git a/c2cgeoportal/scaffolds/create/docker-compose.yml.mako b/c2cgeoportal/scaffolds/create/docker-compose.yml.mako
@@ -3,6 +3,8 @@
 db:
   build: testDB
   environment:
+    POSTGRES_USER: ${dbuser}
+    POSTGRES_DB: ${db}
     POSTGRES_PASSWORD: ${dbpassword}
   #ports:
   #  - 15432:5432

diff --git a/c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl b/c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl
@@ -1207,13 +1207,13 @@ push_docker:
 	docker push $(DOCKER_BASE)_mapserver:$(DOCKER_TAG)
 
 .PHONY: testDB
-testDB: testDB/02-alembic.sql testDB/03-alembic-static.sql
+testDB: testDB/12-alembic.sql testDB/13-alembic-static.sql
 
-testDB/02-alembic.sql: $(VENV_BIN)/alembic$(PYTHON_BIN_POSTFIX) alembic.ini
+testDB/12-alembic.sql: $(VENV_BIN)/alembic$(PYTHON_BIN_POSTFIX) alembic.ini
 	$(PRERULE_CMD)
 	$(VENV_BIN)/alembic -c alembic.ini upgrade --sql head > $@
 
-testDB/03-alembic-static.sql: $(VENV_BIN)/alembic$(PYTHON_BIN_POSTFIX) alembic_static.ini
+testDB/13-alembic-static.sql: $(VENV_BIN)/alembic$(PYTHON_BIN_POSTFIX) alembic_static.ini
 	$(PRERULE_CMD)
 	$(VENV_BIN)/alembic -c alembic_static.ini upgrade --sql head > $@
 endif

diff --git a/c2cgeoportal/scaffolds/update/testDB/01-schemas.sql.mako b/c2cgeoportal/scaffolds/update/testDB/01-schemas.sql.mako
diff --git a/c2cgeoportal/scaffolds/update/testDB/11-schemas.sql.mako b/c2cgeoportal/scaffolds/update/testDB/11-schemas.sql.mako
@@ -0,0 +1,2 @@
+CREATE SCHEMA IF NOT EXISTS ${schema};
+CREATE SCHEMA IF NOT EXISTS ${schema}_static;
diff --git a/c2cgeoportal/scaffolds/update/testDB/Dockerfile.mako b/c2cgeoportal/scaffolds/update/testDB/Dockerfile.mako
@@ -1,6 +1,4 @@
-FROM camptocamp/postgis:9.5
+FROM camptocamp/postgresql:pg9.5-latest
 MAINTAINER Camptocamp "[email protected]"
 
-ENV POSTGRES_USER ${dbuser}
-ENV POSTGRES_DB ${db}
 ADD *.sql *.csv *.sh /docker-entrypoint-initdb.d/
diff --git a/doc/integrator/docker.rst b/doc/integrator/docker.rst
@@ -37,7 +37,7 @@ Database container
 
 You can add scripts to populate the DB container by adding ``.sql`` or ``.sh``
 files in the ``testDB`` directory. They must start with 2 digits, followed by
-an underscore. Please start at number 10.
+an underscore. Please start at number 20.
 
 Developer composition
 ---------------------
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		CREATE SCHEMA IF NOT EXISTS ${schema};
		CREATE SCHEMA IF NOT EXISTS ${schema}_static;