diff --git a/odoo/odoo/Dockerfile.60 b/odoo/odoo/Dockerfile.60 index ea28690..7a87254 100644 --- a/odoo/odoo/Dockerfile.60 +++ b/odoo/odoo/Dockerfile.60 @@ -37,12 +37,12 @@ WORKDIR /opt/odoo/odoo/ RUN python setup.py install # OpenERP 6 extra addons was used, so install it... and its dependencies -# RUN easy_install bzr -# RUN bzr init-repo extra-addons -# RUN bzr branch lp:openobject-addons/extra-6.0 extra-addons/6.0 WORKDIR /opt/odoo/ -COPY openerp-extra-60.zip ./ -RUN unzip openerp-extra-60.zip && rm openerp-extra-60.zip +RUN easy_install bzr +RUN bzr init-repo extra-addons +RUN 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 # Prepare launch diff --git a/odoo/odoo/genconf60.sh b/odoo/odoo/genconf60.sh index 6f21ff5..87addae 100644 --- a/odoo/odoo/genconf60.sh +++ b/odoo/odoo/genconf60.sh @@ -1,7 +1,7 @@ #!/bin/bash CONF=/opt/odoo/openerp-server.conf -ADDONS_PATH="/opt/odoo/odoo/addons,/opt/odoo/openerp-extra-60" +ADDONS_PATH="/opt/odoo/odoo/addons,/opt/odoo/extra-addons/openerp-extra-6.0" # Configuration generation echo " diff --git a/odoo/odoo/openerp-extra-60.zip b/odoo/odoo/openerp-extra-60.zip deleted file mode 100644 index 25d400b..0000000 Binary files a/odoo/odoo/openerp-extra-60.zip and /dev/null differ