From aeabc3c6e6b650a7f48c6730fd15294501115e07 Mon Sep 17 00:00:00 2001
From: Patrick Valsecchi <pvalsecc@users.noreply.github.com>
Date: Thu, 2 Jun 2016 14:05:08 +0200
Subject: [PATCH] Docker: switch to the C2C official postgres image (#2275)

---
 c2cgeoportal/scaffolds/create/+dot+gitignore_tmpl        | 4 +++-
 c2cgeoportal/scaffolds/create/docker-compose.yml.mako    | 2 ++
 c2cgeoportal/scaffolds/update/CONST_Makefile_tmpl        | 6 +++---
 c2cgeoportal/scaffolds/update/testDB/01-schemas.sql.mako | 2 --
 c2cgeoportal/scaffolds/update/testDB/11-schemas.sql.mako | 2 ++
 c2cgeoportal/scaffolds/update/testDB/Dockerfile.mako     | 4 +---
 doc/integrator/docker.rst                                | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 c2cgeoportal/scaffolds/update/testDB/01-schemas.sql.mako
 create mode 100644 c2cgeoportal/scaffolds/update/testDB/11-schemas.sql.mako

diff --git a/c2cgeoportal/scaffolds/create/+dot+gitignore_tmpl b/c2cgeoportal/scaffolds/create/+dot+gitignore_tmpl
index b3c5305ce0..9468dfcbff 100644
--- 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
index f9ad4a4600..462390af7a 100644
--- 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
index b895287614..55140df728 100644
--- 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
deleted file mode 100644
index 4e15ee306b..0000000000
--- a/c2cgeoportal/scaffolds/update/testDB/01-schemas.sql.mako
+++ /dev/null
@@ -1,2 +0,0 @@
-CREATE SCHEMA ${schema};
-CREATE SCHEMA ${schema}_static;
diff --git a/c2cgeoportal/scaffolds/update/testDB/11-schemas.sql.mako b/c2cgeoportal/scaffolds/update/testDB/11-schemas.sql.mako
new file mode 100644
index 0000000000..ffbead58ab
--- /dev/null
+++ 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
index 99bbac2d0e..d3a114f96e 100644
--- 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 "info@camptocamp.com"
 
-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
index ed4ba3a597..3c84f9f6dc 100644
--- 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
 ---------------------