From 372be99c2346fde1f01d87b86d74ff86aeaf49c5 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Thu, 12 Sep 2024 10:30:26 +0200 Subject: [PATCH] [FIX]Oraclelinux 7 : replace fedora EPEL with OL EPEL --- backups/rsyncvolumes/Dockerfile.c7 | 4 ++-- odoo/odoo/Dockerfile.8.centos7 | 4 ++-- odoo/scripts/Dockerfile.c7 | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backups/rsyncvolumes/Dockerfile.c7 b/backups/rsyncvolumes/Dockerfile.c7 index d634c19..f1abfdc 100644 --- a/backups/rsyncvolumes/Dockerfile.c7 +++ b/backups/rsyncvolumes/Dockerfile.c7 @@ -4,8 +4,8 @@ LABEL maintainer="Yaltik - Fabien Bourgeois " ENV SOURCE="/var/lib/docker/volumes" DEST="/var/backups/" RUN yum -y install gettext rsync ssh cronie && \ - yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ - yum --enablerepo=epel -y install sshpass && \ + yum -y install oracle-epel-release-el7 && \ + yum -y install sshpass && \ yum clean all # Avoid overlayfs bug with tail diff --git a/odoo/odoo/Dockerfile.8.centos7 b/odoo/odoo/Dockerfile.8.centos7 index df9d7c1..8b76a08 100644 --- a/odoo/odoo/Dockerfile.8.centos7 +++ b/odoo/odoo/Dockerfile.8.centos7 @@ -9,8 +9,8 @@ LABEL maintainer="Yaltik - Fabien Bourgeois " # Fonts COPY pkgs/odoo8c7/*.rpm ./ RUN yum -y groupinstall "Development Tools" && yum -y install zlib-devel bzip2-devel openssl openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gdbm-devel libpcap-devel xz-devel git mercurial libpng libjpeg libXext curl xorg-x11-font-utils fontconfig python-virtualenv libevent-devel libxml2-devel libxslt-devel openldap-devel openjpeg-devel freetype-devel libjpeg-turbo-devel libtiff-devel kernel-devel && \ - yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ - yum --enablerepo=epel -y install nodejs npm python-pip && \ + yum -y install oracle-epel-release-el7 && \ + yum -y install nodejs npm python2-pip && \ yum -y install https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox-0.12.5-1.centos7.x86_64.rpm && \ npm install -g less@2 less-plugin-clean-css@1.5.1 && \ yum install -y ./*.rpm && \ diff --git a/odoo/scripts/Dockerfile.c7 b/odoo/scripts/Dockerfile.c7 index bfaa6fa..dcddbd5 100644 --- a/odoo/scripts/Dockerfile.c7 +++ b/odoo/scripts/Dockerfile.c7 @@ -1,11 +1,11 @@ -FROM centos:7 +FROM oraclelinux:7 LABEL maintainer="Yaltik - Fabien Bourgeois " # EPEL for PIP -RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \ - yum --enablerepo=epel -y install python-pip && \ +RUN yum -y install oracle-epel-release-el7 && \ + yum -y install python2-pip && \ yum clean all && \ - pip install --no-cache-dir odoorpc==0.8.0 + pip install --no-cache-dir --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org odoorpc==0.8.0 # Useradd RUN useradd odoo -m -s /bin/bash