[FIX][TYPO]Multiple fixes for new images
* Typo on openupgrade git version ; * easy_install now needs manual wget packages ; * Typo on pip no cache dir option ; * Typo on RUN commands chain...
This commit is contained in:
parent
4ba987cc30
commit
8f5ec97146
|
|
@ -4,7 +4,8 @@ LABEL maintainer="Yaltik - Fabien Bourgeois <fabien@yaltik.com>"
|
|||
ENV ODOO_ADMIN_PASSWORD="admin" ODOO_DATABASES="demo"
|
||||
|
||||
USER root
|
||||
RUN apt-get install -y --no-install-recommends cron gettext-base curl && \
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends cron gettext-base curl && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
USER odoo
|
||||
|
|
|
|||
|
|
@ -8,9 +8,14 @@ RUN yum update -y && \
|
|||
python-imaging wget git unzip gcc && yum clean all
|
||||
|
||||
# Install OpenERP dependencies not available from CentOS6 repo
|
||||
RUN easy_install pydot==1.0.29 && \
|
||||
easy_install vobject==0.8.2 && \
|
||||
easy_install PyWebDAV==0.9.4.1
|
||||
RUN wget -q https://files.pythonhosted.org/packages/6f/2c/47457771c02a8ff0f302b695e094ec309e30452232bd79198ee94fda689f/pyparsing-1.5.7.tar.gz && \
|
||||
easy_install pyparsing-1.5.7.tar.gz && \
|
||||
wget -q https://files.pythonhosted.org/packages/8d/ca/bed32e7ced110aeef48a223610e57382bc52a043e14de656de98a492546c/pydot-1.0.29.tar.gz && \
|
||||
easy_install pydot-1.0.29.tar.gz && \
|
||||
wget -q https://files.pythonhosted.org/packages/e1/d3/26a9d0fcdde02ebc35e600e6de6f3a8814423c056e2bde1be1f66f121bc4/vobject-0.8.2.tar.gz && \
|
||||
easy_install vobject-0.8.2.tar.gz && \
|
||||
wget -q https://files.pythonhosted.org/packages/9a/42/5040f056007156804229424674f7538fb40fbb3cc899c674c51c1f8830ac/PyWebDAV-0.9.4.tar.gz && \
|
||||
easy_install PyWebDAV-0.9.4.tar.gz
|
||||
# Alternative : home install PyWebDAV, not useless finally
|
||||
# RUN wget https://files.pythonhosted.org/packages/e9/14/5f2a654233e533797f32dd670dab8dd61ac974d5105950481e872bddb898/PyWebDAV-0.9.8.tar.gz
|
||||
# RUN tar xzf PyWebDAV-0.9.8.tar.gz
|
||||
|
|
@ -37,12 +42,14 @@ RUN python setup.py install
|
|||
|
||||
# OpenERP 6 extra addons was used, so install it... and its dependencies
|
||||
WORKDIR /opt/odoo/
|
||||
RUN easy_install bzr && \
|
||||
RUN wget -q https://files.pythonhosted.org/packages/62/3a/81325e34bcc78f67cc33dfac64f44e7c8329d4481dec1b789267b98644c3/bzr-2.7.0.tar.gz && \
|
||||
easy_install bzr-2.7.0.tar.gz && \
|
||||
bzr init-repo extra-addons && \
|
||||
bzr branch lp:openobject-addons/extra-6.0 extra-addons/openerp-extra-6.0
|
||||
# COPY openerp-extra-60.zip ./
|
||||
# RUN unzip openerp-extra-60.zip && rm openerp-extra-60.zip
|
||||
RUN easy_install egenix-mx-base
|
||||
RUN wget -q https://files.pythonhosted.org/packages/66/e6/e0709aedeb4a5c92a1aeb8c47ab50e9506eafc865806801bd3f01d72b671/egenix-mx-base-3.2.9.zip && \
|
||||
easy_install egenix-mx-base-3.2.9.zip
|
||||
|
||||
# Prepare launch
|
||||
USER odoo
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ LABEL maintainer="Yaltik - Fabien Bourgeois <fabien@yaltik.com>"
|
|||
|
||||
# Extra dependencies
|
||||
RUN pip install --user --no-cache-dir unidecode==1.2.0 && \
|
||||
pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2
|
||||
pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@3.3.2
|
||||
|
||||
# External code
|
||||
WORKDIR /opt/odoo/extra-addons
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ LABEL maintainer="Yaltik - Fabien Bourgeois <fabien@yaltik.com>"
|
|||
|
||||
# Extra dependencies
|
||||
RUN pip install --user --no-cache-dir unidecode==1.2.0 requests-oauthlib==1.3.1 && \
|
||||
pip install --user git+https://github.com/OCA/openupgradelib.git@v3.3.2
|
||||
pip install --user git+https://github.com/OCA/openupgradelib.git@3.3.2
|
||||
|
||||
# External code
|
||||
WORKDIR /opt/odoo/extra-addons
|
||||
|
|
|
|||
|
|
@ -24,4 +24,4 @@ WORKDIR /opt/odoo
|
|||
|
||||
# Addons dependencies
|
||||
RUN .local/bin/pip3 install --user --no-cache-dir setuptools-scm==5.0.2 && \
|
||||
.local/bin/pip3 install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2
|
||||
.local/bin/pip3 install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@3.3.2
|
||||
|
|
|
|||
|
|
@ -20,4 +20,4 @@ RUN git clone --depth 1 -b 14.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom
|
|||
WORKDIR /opt/odoo
|
||||
|
||||
# Addons dependencies
|
||||
RUN .local/bin/pip3 install --no-cache-dir --user git+https://github.com/OCA/openupgradelib.git@v3.3.2
|
||||
RUN .local/bin/pip3 install --no-cache-dir --user git+https://github.com/OCA/openupgradelib.git@3.3.2
|
||||
|
|
|
|||
|
|
@ -20,4 +20,4 @@ RUN git clone --depth 1 -b 15.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom
|
|||
WORKDIR /opt/odoo
|
||||
|
||||
# Addons dependencies
|
||||
RUN .local/bin/pip3 install --user git+https://github.com/OCA/openupgradelib.git@v3.3.2
|
||||
RUN .local/bin/pip3 install --user git+https://github.com/OCA/openupgradelib.git@3.3.2
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ LABEL maintainer="Yaltik - Fabien Bourgeois <fabien@yaltik.com>"
|
|||
WORKDIR /opt/odoo
|
||||
RUN rm -rf OCB/ && \
|
||||
RUN git clone -b "${ODOO_BRANCH}" --depth 1 https://github.com/OCA/OpenUpgrade.git OCB && \
|
||||
pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2
|
||||
pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@3.3.2
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ LABEL maintainer="Yaltik - Fabien Bourgeois <fabien@yaltik.com>"
|
|||
WORKDIR /opt/odoo
|
||||
RUN rm -rf OCB/ && \
|
||||
RUN git clone -b "${ODOO_BRANCH}" --depth 1 https://github.com/OCA/OpenUpgrade.git OCB && \
|
||||
pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2
|
||||
pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@3.3.2
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ LABEL maintainer="Yaltik - Fabien Bourgeois <fabien@yaltik.com>"
|
|||
WORKDIR /opt/odoo
|
||||
RUN rm -rf OCB/ && \
|
||||
RUN git clone -b "${ODOO_BRANCH}" --depth 1 https://github.com/OCA/OpenUpgrade.git OCB && \
|
||||
pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2
|
||||
pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@3.3.2
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ LABEL maintainer="Yaltik - Fabien Bourgeois <fabien@yaltik.com>"
|
|||
WORKDIR /opt/odoo
|
||||
RUN rm -rf OCB/ && \
|
||||
RUN git clone -b "${ODOO_BRANCH}" --depth 1 https://github.com/OCA/OpenUpgrade.git OCB && \
|
||||
pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@v3.3.2
|
||||
pip install --user --no-cache-dir git+https://github.com/OCA/openupgradelib.git@3.3.2
|
||||
|
|
|
|||
|
|
@ -40,7 +40,22 @@ WORKDIR /opt/odoo/openerp-web/lib
|
|||
RUN bash populate.sh
|
||||
|
||||
WORKDIR /opt/odoo/openerp-web
|
||||
RUN python setup.py install
|
||||
# Needed in 2022, every dependency
|
||||
RUN wget -q https://files.pythonhosted.org/packages/38/b2/7e8d6c97fb684ba6b131e9173a09ff2f0341f85a7376038df7318cd3ed0e/CherryPy-3.1.2.tar.gz && \
|
||||
easy_install CherryPy-3.1.2.tar.gz && \
|
||||
wget -q https://files.pythonhosted.org/packages/65/b7/371df6136a2dceab36c1bd3947211b112f78225c4d0a6a3e20eb008cbc16/Mako-0.2.4.tar.gz && \
|
||||
easy_install Mako-0.2.4.tar.gz && \
|
||||
wget -q https://files.pythonhosted.org/packages/5a/9d/2ed1579c088a6c5953bf31b9929cb0b2421252bd0f7fceed6e9e8f21b007/Babel-0.9.6-py2.6.egg && \
|
||||
easy_install Babel-0.9.6-py2.6.egg && \
|
||||
wget -q https://files.pythonhosted.org/packages/b9/f7/b545bc8d7dfc4b3cbd74c60c6af816110bcfecc02f7e36e7d62dd8bf9d1a/FormEncode-1.2.2.tar.gz && \
|
||||
easy_install FormEncode-1.2.2.tar.gz && \
|
||||
wget -q https://files.pythonhosted.org/packages/da/8c/a45815b421e49acad7d3d0db4ba65ba1e5cfa02a30c794fe55954106cb0b/simplejson-2.0.9.tar.gz && \
|
||||
easy_install simplejson-2.0.9.tar.gz && \
|
||||
wget -q https://files.pythonhosted.org/packages/27/50/0a3e33ba83cebfef5e14fd52c1d6f053870618b6e15cf3e99fd5b893b2c7/python-dateutil-1.4.1.tar.gz && \
|
||||
easy_install python-dateutil-1.4.1.tar.gz && \
|
||||
wget -q https://files.pythonhosted.org/packages/ab/ff/9c14978cffcc911ea84ba0ceacedcad78e7722fdafbcde8ce52ce04fa0db/pytz-2009j.tar.gz && \
|
||||
easy_install pytz-2009j.tar.gz && \
|
||||
python setup.py install
|
||||
|
||||
USER odoo
|
||||
WORKDIR /opt/odoo
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ LABEL maintainer="Yaltik - Fabien Bourgeois <fabien@yaltik.com>"
|
|||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends python2.7-minimal python-pip && \
|
||||
apt-get clean rm -rf /var/lib/apt/lists/* && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/* && \
|
||||
pip2 install --no-cache-dir odoorpc==0.8.0
|
||||
|
||||
# Useradd
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ USER radicale
|
|||
# Install Radicale
|
||||
# v2.1.9 because of regressions on v2.1.10+ on SSL handling
|
||||
ENV VERSION 2.1.9
|
||||
RUN pip3 install --user --upgrade --no-cache-dir radicale==${VERSION}
|
||||
RUN pip3 install --user --upgrade radicale==${VERSION}
|
||||
COPY config /opt/radicale/radicale.conf
|
||||
RUN mkdir /opt/radicale/storage
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ USER radicale
|
|||
# Was v2.1.9 because of regressions on v2.1.10+ on SSL handling, so no more included SSL ATM
|
||||
# No v3 ATM : huge refacotring, whole plugin obsolete...
|
||||
ENV VERSION 2.1.12
|
||||
RUN scl enable rh-python38 "pip install --user --no-cached-dir radicale==${VERSION}"
|
||||
RUN scl enable rh-python38 "pip install --user --no-cache-dir radicale==${VERSION}"
|
||||
COPY config .config/radicale/config/
|
||||
RUN mkdir /opt/radicale/storage
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue