From 6600fd73a6dd6a651a9c4a2ba14372d26dcae41b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Thu, 10 Oct 2019 16:56:53 +0200 Subject: [PATCH] [FIX] 11.0-13.0: use python image as base image In order to have an up to date version of Python and therefore an up to date pip version, the Python Docker image is used instead of the Debian one. The choosen Python Docker images are based on desired version of Debian. This avoid to upgrade pip inside the image, that was resulting in a useless copy of pip. --- 11.0/Dockerfile | 3 +-- 12.0/Dockerfile | 3 +-- 13.0/Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index e872d7f..767d416 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM python:3.5-slim-stretch LABEL maintainer="Odoo S.A. " # Generate locale C.UTF-8 for postgres and general locale data @@ -54,7 +54,6 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file -RUN pip3 install --upgrade pip RUN pip3 install num2words xlwt phonenumbers COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index 231dcff..14d3e0c 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM python:3.5-slim-stretch LABEL maintainer="Odoo S.A. " # Generate locale C.UTF-8 for postgres and general locale data @@ -68,7 +68,6 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file -RUN pip3 install --upgrade pip RUN pip3 install num2words xlwt phonenumbers COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index ed1e4d0..34419a1 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM python:3.7-slim-buster LABEL maintainer="Odoo S.A. " # Generate locale C.UTF-8 for postgres and general locale data @@ -59,7 +59,6 @@ RUN set -x; \ && rm -rf /var/lib/apt/lists/* odoo.deb # Copy entrypoint script and Odoo configuration file -RUN pip3 install --upgrade pip RUN pip3 install num2words xlwt phonenumbers COPY ./entrypoint.sh / COPY ./odoo.conf /etc/odoo/