diff --git a/odoo/odoo/Dockerfile.10.centos7 b/odoo/odoo/Dockerfile.10.centos7 index f65d3a6..4acaebe 100644 --- a/odoo/odoo/Dockerfile.10.centos7 +++ b/odoo/odoo/Dockerfile.10.centos7 @@ -39,6 +39,25 @@ RUN mkdir pipcache data backups extra-addons custom-addons RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git RUN pip install --user -r OCB/requirements.txt +# TMP : merge security PRs +WORKDIR /opt/odoo/OCB +RUN curl -LO https://github.com/OCA/OCB/pull/964.patch \ + && curl -LO https://github.com/OCA/OCB/pull/968.patch \ + && curl -LO https://github.com/OCA/OCB/pull/971.patch \ + && curl -LO https://github.com/OCA/OCB/pull/974.patch \ + && curl -LO https://github.com/OCA/OCB/pull/976.patch \ + && curl -LO https://github.com/OCA/OCB/pull/978.patch \ + && curl -LO https://github.com/OCA/OCB/pull/981.patch \ + && curl -LO https://github.com/OCA/OCB/pull/984.patch \ + && curl -LO https://github.com/OCA/OCB/pull/986.patch \ + && curl -LO https://github.com/OCA/OCB/pull/988.patch \ + && curl -LO https://github.com/OCA/OCB/pull/991.patch +RUN git config user.email "fabien@yaltik.com" \ + && git config user.name "Fabien BOURGEOIS" +RUN git am *.patch +WORKDIR /opt/odoo + + # Launch scripts COPY ./launch10.sh ./ COPY ./genconf.sh ./ diff --git a/odoo/odoo/Dockerfile.8.centos7 b/odoo/odoo/Dockerfile.8.centos7 index 08c0fd3..f801a5e 100644 --- a/odoo/odoo/Dockerfile.8.centos7 +++ b/odoo/odoo/Dockerfile.8.centos7 @@ -35,6 +35,18 @@ RUN mkdir pipcache data backups extra-addons custom-addons RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git RUN pip install --user -r OCB/requirements.txt +# TMP : merge security PRs +WORKDIR /opt/odoo/OCB +RUN curl -LO https://github.com/OCA/OCB/pull/966.patch \ + && curl -LO https://github.com/OCA/OCB/pull/970.patch \ + && curl -LO https://github.com/OCA/OCB/pull/980.patch \ + && curl -LO https://github.com/OCA/OCB/pull/983.patch \ + && curl -LO https://github.com/OCA/OCB/pull/990.patch +RUN git config user.email "fabien@yaltik.com" \ + && git config user.name "Fabien BOURGEOIS" +RUN git am *.patch +WORKDIR /opt/odoo + # Launch scripts COPY ./launch.sh ./ COPY ./genconf.sh ./