From cf1bb15af80aad7c24a83e3a63729700c723f988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Thu, 22 Sep 2022 15:28:38 +0200
Subject: [PATCH] [UPD] requirements file source
---
16.0-alpine.Dockerfile | 11 ++++++-----
16.0.Dockerfile | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/16.0-alpine.Dockerfile b/16.0-alpine.Dockerfile
index 600f3ca..55d4504 100644
--- a/16.0-alpine.Dockerfile
+++ b/16.0-alpine.Dockerfile
@@ -1,11 +1,12 @@
FROM surnet/alpine-wkhtmltopdf:3.16.0-0.12.6-small as wkhtmltopdf
FROM python:3.10-alpine AS builder
-RUN apk add --no-cache python3-dev libffi-dev gcc musl-dev make postgresql-dev openldap-dev cyrus-sasl-dev jpeg-dev zlib-dev libsass-dev g++
-RUN pip install wheel
-RUN echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so
-RUN pip wheel --wheel-dir=/svc/wheels -r https://raw.githubusercontent.com/odoo/odoo/master/requirements.txt
-RUN pip wheel --wheel-dir=/svc/wheels phonenumbers simplejson openupgradelib PyYAML
+RUN set -x; \
+ apk add --no-cache python3-dev libffi-dev gcc musl-dev make postgresql-dev openldap-dev cyrus-sasl-dev jpeg-dev zlib-dev libsass-dev g++ &&\
+ pip install wheel &&\
+ echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so &&\
+ pip wheel --wheel-dir=/svc/wheels -r https://raw.githubusercontent.com/odoo/odoo/master/requirements.txt &&\
+ pip wheel --wheel-dir=/svc/wheels phonenumbers simplejson openupgradelib PyYAML
FROM python:3.10-alpine AS final
diff --git a/16.0.Dockerfile b/16.0.Dockerfile
index 9ba6365..ece96cf 100644
--- a/16.0.Dockerfile
+++ b/16.0.Dockerfile
@@ -3,7 +3,7 @@ RUN set -x; \
apt-get update &&\
apt-get install -y --no-install-recommends build-essential libldap2-dev libpq-dev libsasl2-dev &&\
pip install wheel &&\
- pip wheel --wheel-dir=/svc/wheels -r https://raw.githubusercontent.com/odoo/odoo/master/requirements.txt &&\
+ pip wheel --wheel-dir=/svc/wheels -r https://raw.githubusercontent.com/oca/OCB/16.0/requirements.txt &&\
pip wheel --wheel-dir=/svc/wheels phonenumbers simplejson openupgradelib PyYAML
@@ -31,7 +31,7 @@ RUN set -x; \
rm -rf /var/lib/apt/lists/* wkhtmltox.deb
COPY --from=builder /svc /svc
-RUN pip3 install --no-index --find-links=/svc/wheels -r https://raw.githubusercontent.com/odoo/odoo/master/requirements.txt &&\
+RUN pip3 install --no-index --find-links=/svc/wheels -r https://raw.githubusercontent.com/oca/OCB/16.0/requirements.txt &&\
pip3 install --no-index --find-links=/svc/wheels phonenumbers simplejson openupgradelib PyYAML
# Add Git Known Hosts
--
GitLab