From 9034ff4d0045665f8e98c45c9da85bf7f6addfcd Mon Sep 17 00:00:00 2001 From: Juan Ramon Date: Thu, 7 Apr 2022 20:01:47 +0200 Subject: [PATCH] Rework to permit tests --- 11.0.Dockerfile | 8 +------- 12.0.Dockerfile | 8 +------- 13.0.Dockerfile | 2 +- 14.0.Dockerfile | 6 +----- 15.0.Dockerfile | 2 +- lib/kwkhtmltopdf_client.py => bin/wkhtmltopdf | 0 6 files changed, 5 insertions(+), 21 deletions(-) rename lib/kwkhtmltopdf_client.py => bin/wkhtmltopdf (100%) diff --git a/11.0.Dockerfile b/11.0.Dockerfile index 6bdf1edd..ee6b56d9 100644 --- a/11.0.Dockerfile +++ b/11.0.Dockerfile @@ -4,11 +4,10 @@ EXPOSE 8069 8072 ARG GEOIP_UPDATER_VERSION=4.1.5 ARG MQT=https://github.com/OCA/maintainer-quality-tools.git -ARG WKHTMLTOPDF_VERSION=0.12.5 -ARG WKHTMLTOPDF_CHECKSUM='1140b0ab02aa6e17346af2f14ed0de807376de475ba90e1db3975f112fbd20bb' ENV DB_FILTER=.* \ DEPTH_DEFAULT=1 \ DEPTH_MERGE=100 \ + KWKHTMLTOPDF_SERVER_URL=MOCK \ EMAIL=https://hub.docker.com/r/tecnativa/odoo \ GEOIP_ACCOUNT_ID="" \ GEOIP_LICENSE_KEY="" \ @@ -56,11 +55,6 @@ RUN apt-get -qq update \ && curl -sL https://deb.nodesource.com/setup_6.x | bash - \ && apt-get update \ && apt-get install -yqq --no-install-recommends nodejs \ - && curl -SLo wkhtmltox.deb https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/${WKHTMLTOPDF_VERSION}/wkhtmltox_${WKHTMLTOPDF_VERSION}-1.stretch_amd64.deb \ - && echo "${WKHTMLTOPDF_CHECKSUM} wkhtmltox.deb" | sha256sum -c - \ - && apt-get install -yqq --no-install-recommends ./wkhtmltox.deb \ - && rm wkhtmltox.deb \ - && wkhtmltopdf --version \ && curl --silent -L --output geoipupdate_${GEOIP_UPDATER_VERSION}_linux_amd64.deb https://github.com/maxmind/geoipupdate/releases/download/v${GEOIP_UPDATER_VERSION}/geoipupdate_${GEOIP_UPDATER_VERSION}_linux_amd64.deb \ && dpkg -i geoipupdate_${GEOIP_UPDATER_VERSION}_linux_amd64.deb \ && rm geoipupdate_${GEOIP_UPDATER_VERSION}_linux_amd64.deb \ diff --git a/12.0.Dockerfile b/12.0.Dockerfile index 427f69bd..3f6cfe0b 100644 --- a/12.0.Dockerfile +++ b/12.0.Dockerfile @@ -4,11 +4,10 @@ EXPOSE 8069 8072 ARG GEOIP_UPDATER_VERSION=4.1.5 ARG MQT=https://github.com/OCA/maintainer-quality-tools.git -ARG WKHTMLTOPDF_VERSION=0.12.5 -ARG WKHTMLTOPDF_CHECKSUM='1140b0ab02aa6e17346af2f14ed0de807376de475ba90e1db3975f112fbd20bb' ENV DB_FILTER=.* \ DEPTH_DEFAULT=1 \ DEPTH_MERGE=100 \ + KWKHTMLTOPDF_SERVER_URL=MOCK \ EMAIL=https://hub.docker.com/r/tecnativa/odoo \ GEOIP_ACCOUNT_ID="" \ GEOIP_LICENSE_KEY="" \ @@ -56,11 +55,6 @@ RUN apt-get -qq update \ && curl -sL https://deb.nodesource.com/setup_8.x | bash - \ && apt-get update \ && apt-get install -yqq --no-install-recommends nodejs \ - && curl -SLo wkhtmltox.deb https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/${WKHTMLTOPDF_VERSION}/wkhtmltox_${WKHTMLTOPDF_VERSION}-1.stretch_amd64.deb \ - && echo "${WKHTMLTOPDF_CHECKSUM} wkhtmltox.deb" | sha256sum -c - \ - && apt-get install -yqq --no-install-recommends ./wkhtmltox.deb \ - && rm wkhtmltox.deb \ - && wkhtmltopdf --version \ && curl --silent -L --output geoipupdate_${GEOIP_UPDATER_VERSION}_linux_amd64.deb https://github.com/maxmind/geoipupdate/releases/download/v${GEOIP_UPDATER_VERSION}/geoipupdate_${GEOIP_UPDATER_VERSION}_linux_amd64.deb \ && dpkg -i geoipupdate_${GEOIP_UPDATER_VERSION}_linux_amd64.deb \ && rm geoipupdate_${GEOIP_UPDATER_VERSION}_linux_amd64.deb \ diff --git a/13.0.Dockerfile b/13.0.Dockerfile index b9cd57b5..3227b170 100644 --- a/13.0.Dockerfile +++ b/13.0.Dockerfile @@ -7,6 +7,7 @@ ARG MQT=https://github.com/OCA/maintainer-quality-tools.git ENV DB_FILTER=.* \ DEPTH_DEFAULT=1 \ DEPTH_MERGE=100 \ + KWKHTMLTOPDF_SERVER_URL=MOCK \ EMAIL=https://hub.docker.com/r/tecnativa/odoo \ GEOIP_ACCOUNT_ID="" \ GEOIP_LICENSE_KEY="" \ @@ -64,7 +65,6 @@ RUN apt-get -qq update \ WORKDIR /opt/odoo COPY bin/* /usr/local/bin/ -COPY lib/kwkhtmltopdf_client.py /usr/local/bin/wkhtmltopdf COPY lib/doodbalib /usr/local/lib/python3.6/site-packages/doodbalib COPY build.d common/build.d COPY conf.d common/conf.d diff --git a/14.0.Dockerfile b/14.0.Dockerfile index 1c3fde3f..14a8a59a 100644 --- a/14.0.Dockerfile +++ b/14.0.Dockerfile @@ -3,11 +3,10 @@ FROM python:3.8-slim-buster AS base EXPOSE 8069 8072 ARG GEOIP_UPDATER_VERSION=4.3.0 -ARG WKHTMLTOPDF_VERSION=0.12.5 -ARG WKHTMLTOPDF_CHECKSUM='dfab5506104447eef2530d1adb9840ee3a67f30caaad5e9bcb8743ef2f9421bd' ENV DB_FILTER=.* \ DEPTH_DEFAULT=1 \ DEPTH_MERGE=100 \ + KWKHTMLTOPDF_SERVER_URL=MOCK \ EMAIL=https://hub.docker.com/r/tecnativa/odoo \ GEOIP_ACCOUNT_ID="" \ GEOIP_LICENSE_KEY="" \ @@ -36,10 +35,7 @@ ENV DB_FILTER=.* \ RUN apt-get -qq update \ && apt-get install -yqq --no-install-recommends \ curl \ - && curl -SLo wkhtmltox.deb https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/${WKHTMLTOPDF_VERSION}/wkhtmltox_${WKHTMLTOPDF_VERSION}-1.buster_amd64.deb \ - && echo "${WKHTMLTOPDF_CHECKSUM} wkhtmltox.deb" | sha256sum -c - \ && apt-get install -yqq --no-install-recommends \ - ./wkhtmltox.deb \ chromium \ ffmpeg \ fonts-liberation2 \ diff --git a/15.0.Dockerfile b/15.0.Dockerfile index 992372db..81c1e5a3 100644 --- a/15.0.Dockerfile +++ b/15.0.Dockerfile @@ -6,6 +6,7 @@ ARG GEOIP_UPDATER_VERSION=4.3.0 ENV DB_FILTER=.* \ DEPTH_DEFAULT=1 \ DEPTH_MERGE=100 \ + KWKHTMLTOPDF_SERVER_URL=MOCK \ EMAIL=https://hub.docker.com/r/tecnativa/odoo \ GEOIP_ACCOUNT_ID="" \ GEOIP_LICENSE_KEY="" \ @@ -59,7 +60,6 @@ RUN apt-get -qq update \ WORKDIR /opt/odoo COPY bin/* /usr/local/bin/ -COPY lib/kwkhtmltopdf_client.py /usr/local/bin/wkhtmltopdf COPY lib/doodbalib /usr/local/lib/python3.8/site-packages/doodbalib COPY build.d common/build.d COPY conf.d common/conf.d diff --git a/lib/kwkhtmltopdf_client.py b/bin/wkhtmltopdf similarity index 100% rename from lib/kwkhtmltopdf_client.py rename to bin/wkhtmltopdf