From 42f2dce52b7deef4e740a5ec568b48bcf83d7e23 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Mon, 11 Jan 2021 16:08:37 +0100 Subject: [PATCH] [REM]Odoo v8/10 images : remove security patches As they were merged upstream. --- odoo/odoo/Dockerfile.10.centos7 | 20 -------------------- odoo/odoo/Dockerfile.8.centos7 | 13 ------------- 2 files changed, 33 deletions(-) diff --git a/odoo/odoo/Dockerfile.10.centos7 b/odoo/odoo/Dockerfile.10.centos7 index 428eca1..f65d3a6 100644 --- a/odoo/odoo/Dockerfile.10.centos7 +++ b/odoo/odoo/Dockerfile.10.centos7 @@ -39,26 +39,6 @@ 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 \ - && curl -LO https://github.com/OCA/OCB/pull/992.patch -RUN git config user.email "fabien@yaltik.com" \ - && git config user.name "Fabien BOURGEOIS" -RUN git am *.patch && rm *.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 572b8ab..08c0fd3 100644 --- a/odoo/odoo/Dockerfile.8.centos7 +++ b/odoo/odoo/Dockerfile.8.centos7 @@ -35,19 +35,6 @@ 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 \ - && curl -LO https://github.com/OCA/OCB/pull/994.patch -RUN git config user.email "fabien@yaltik.com" \ - && git config user.name "Fabien BOURGEOIS" -RUN git am *.patch && rm *.patch -WORKDIR /opt/odoo - # Launch scripts COPY ./launch.sh ./ COPY ./genconf.sh ./