From 4abb6bf62ea2c90d6f88a62581676c5ed8ae0962 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Thu, 15 Nov 2018 12:24:59 +0100
Subject: [PATCH] [ADD]Flectra : two images for PostgreSQL 9.6 and 10

---
 odoo/base.yml                | 12 +++++++++++-
 odoo/flectra/Dockerfile.pg10 | 12 ++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 odoo/flectra/Dockerfile.pg10

diff --git a/odoo/base.yml b/odoo/base.yml
index 8b833de..b883992 100644
--- a/odoo/base.yml
+++ b/odoo/base.yml
@@ -125,7 +125,7 @@ services:
     build:
       context: ./flectra
       dockerfile: Dockerfile
-    image: registry.yaltik.net/flectra:yaltik1
+    image: registry.yaltik.net/flectra:yaltik1pg96
     environment:
       DB_MAXCONN: 20
       XMLRPC_PORT: 8069
@@ -138,6 +138,16 @@ services:
       POSTGRES_USER: flectra
       POSTGRES_PASSWORD: somethingToChange
 
+  flectrapg10:
+    init: true
+    extends:
+      file: base.yml
+      service: flectra
+    build:
+      context: ./flectra
+      dockerfile: Dockerfile.pg10
+    image: registry.yaltik.net/flectra:yaltik1pg10
+
   odoocmd:
     build:
       context: ./scripts
diff --git a/odoo/flectra/Dockerfile.pg10 b/odoo/flectra/Dockerfile.pg10
new file mode 100644
index 0000000..4e2f5bf
--- /dev/null
+++ b/odoo/flectra/Dockerfile.pg10
@@ -0,0 +1,12 @@
+FROM registry.yaltik.net/flectra:yaltik1pg96
+MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
+
+USER root
+# PostgreSQL 10.x
+RUN apt-get update && apt-get install -y --no-install-recommends gnupg
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" \
+      > /etc/apt/sources.list.d/postgresql.list \
+      && curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+      && apt-get update \
+      && apt-get install -y libpq-dev postgresql-client-10
+USER flectra