From e62edfa0e8efd68d510917d1a97c50ef5b45ff3f Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Thu, 28 Jan 2021 10:18:59 +0100
Subject: [PATCH] [IMP]Odoo / Postgre : replace CentOS 6 by OracleLinux 6

Because Oracle Linux has updated Docker images
---
 odoo/odoo/Dockerfile.60     | 2 +-
 odoo/odoo/Dockerfile.web.60 | 4 ++--
 postgres/Dockerfile.84      | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/odoo/odoo/Dockerfile.60 b/odoo/odoo/Dockerfile.60
index 7a87254..7ca1cd8 100644
--- a/odoo/odoo/Dockerfile.60
+++ b/odoo/odoo/Dockerfile.60
@@ -1,4 +1,4 @@
-FROM centos:6
+FROM oraclelinux:6
 MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
 
 # OpenERP dependencies from CentOS
diff --git a/odoo/odoo/Dockerfile.web.60 b/odoo/odoo/Dockerfile.web.60
index f56085a..8037998 100644
--- a/odoo/odoo/Dockerfile.web.60
+++ b/odoo/odoo/Dockerfile.web.60
@@ -1,10 +1,10 @@
-FROM centos:6
+FROM oraclelinux:6
 MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
 
 # OpenERP dependencies from CentOS
 # RUN yum update -y
 RUN yum install -y python-devel python-lxml python-psycopg2 python-mako \
-python-setuptools wget git gcc
+python-setuptools wget git gcc tar
 # RUN yum groupinstall -y "Development Tools"
 
 # PIP
diff --git a/postgres/Dockerfile.84 b/postgres/Dockerfile.84
index 878ddf7..f0585d8 100644
--- a/postgres/Dockerfile.84
+++ b/postgres/Dockerfile.84
@@ -1,4 +1,4 @@
-FROM centos:6
+FROM oraclelinux:6
 
 MAINTAINER "Kentaro Ohkouchi" <nanasess@fsm.ne.jp>
 MAINTAINER "Fabien BOURGEOIS" <fabien@yaltik.com
@@ -20,6 +20,7 @@ RUN  curl -sSL https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/
 
 RUN yum -y install postgresql-server; yum clean all; chkconfig postgresql on
 
+RUN yum -y reinstall glibc-common # Needed for UTF8
 RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8
 ENV LANG fr_FR.utf8