From 574e94d6993d2f47d18d70f92d4dfd95ec8cb099 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Fri, 4 Aug 2017 17:35:03 +0200
Subject: [PATCH] [ADD]Odoo OpenUpgrade 9 on dev.yml

---
 odoo/base.yml                      | 17 ---------------
 odoo/dev.yml                       | 34 ++++++++++++++++++++++++++++++
 odoo/odoo/Dockerfile.openupgrade.9 |  7 ++++++
 3 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 odoo/odoo/Dockerfile.openupgrade.9

diff --git a/odoo/base.yml b/odoo/base.yml
index 358ea39..edb66ae 100644
--- a/odoo/base.yml
+++ b/odoo/base.yml
@@ -63,23 +63,6 @@ services:
       POSTGRES_USER: odoo
       POSTGRES_PASSWORD: somethingToChange
 
-  openupgrade10:
-    build:
-      context: ./odoo
-      dockerfile: Dockerfile.openupgrade.10
-    image: registry.yaltik.net/odoo:yaltikopenupgrade10
-    environment:
-      DB_MAXCONN: 20
-      XMLRPC_PORT: 8069
-      LONGPOLLING_PORT: 8072
-      WORKERS: 2
-      LIMIT_TIME_CPU: 720
-      LIMIT_TIME_REAL: 1440
-      ADMIN_PASSWORD: somethingToChange
-      LIST_DB: "False"
-      POSTGRES_USER: odoo
-      POSTGRES_PASSWORD: somethingToChange
-
   odoocmd:
     build:
       context: ./scripts
diff --git a/odoo/dev.yml b/odoo/dev.yml
index a01d119..8139e01 100644
--- a/odoo/dev.yml
+++ b/odoo/dev.yml
@@ -50,3 +50,37 @@ services:
       WORKERS: 2
       LIMIT_TIME_CPU: 3000
       LIMIT_TIME_REAL: 6000
+
+  openupgrade9:
+    build:
+      context: ./odoo
+      dockerfile: Dockerfile.openupgrade.9
+    image: odoodev:yaltikopenupgrade9
+    environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      WORKERS: 2
+      LIMIT_TIME_CPU: 3000
+      LIMIT_TIME_REAL: 6000
+      ADMIN_PASSWORD: somethingToChange
+      LIST_DB: "True"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
+
+  openupgrade10:
+    build:
+      context: ./odoo
+      dockerfile: Dockerfile.openupgrade.10
+    image: odoodev:yaltikopenupgrade10
+    environment:
+      DB_MAXCONN: 20
+      XMLRPC_PORT: 8069
+      LONGPOLLING_PORT: 8072
+      WORKERS: 2
+      LIMIT_TIME_CPU: 3000
+      LIMIT_TIME_REAL: 6000
+      ADMIN_PASSWORD: somethingToChange
+      LIST_DB: "True"
+      POSTGRES_USER: odoo
+      POSTGRES_PASSWORD: somethingToChange
diff --git a/odoo/odoo/Dockerfile.openupgrade.9 b/odoo/odoo/Dockerfile.openupgrade.9
new file mode 100644
index 0000000..186083f
--- /dev/null
+++ b/odoo/odoo/Dockerfile.openupgrade.9
@@ -0,0 +1,7 @@
+FROM registry.yaltik.net/odoo:yaltik9
+MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
+
+WORKDIR /opt/odoo
+RUN rm -rf OCB/
+RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OpenUpgrade.git OCB
+RUN pip install --user openupgradelib