Yaltik/docker_images
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[REM]Odoo v8/10 images : remove security patches

Browse Source 
As they were merged upstream.
This commit is contained in:
Fabien BOURGEOIS 2021-01-11 16:08:37 +01:00
parent 35299b2c6c
commit 42f2dce52b
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
odoo/odoo/Dockerfile.10.centos7
View File

@ -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 ./

13
odoo/odoo/Dockerfile.8.centos7
View File

@ -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 ./