diff --git a/16.0-alpine.Dockerfile b/16.0-alpine.Dockerfile index 600f3ca9ef9cea5249c4e069053b7a5cf4e2bcf0..55d45042d8448f5b127f78b1ff084699a4b758d0 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 9ba63653e845c3dfd2d7d5503f303999edab5030..ece96cf0b49dbd4184b11583d6242a1a47fb38b3 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