diff --git a/Dockerfile b/Dockerfile index 1210de32..8fd3e2ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ FROM hibou/hibou-odoo:12.0 USER odoo -COPY --from=registry.gitlab.com/hibou-io/athene:node16 /opt/athene /opt/athene COPY --from=hibou/flow /flow /flow COPY --chown=104 entrypoint.sh /entrypoint.sh COPY --chown=104 . /opt/odoo/hibou-suite @@ -9,8 +8,3 @@ RUN rm /etc/odoo/odoo.conf \ && cp /opt/odoo/hibou-suite/debian/odoo.conf /etc/odoo/odoo.conf \ ; -EXPOSE 3000 -ENV SHELL=/bin/bash \ - THEIA_DEFAULT_PLUGINS=local-dir:/opt/athene/plugins -ENV USE_LOCAL_GIT true - diff --git a/Dockerfile-GitLab b/Dockerfile-GitLab index 9b20155d..ad8585f8 100644 --- a/Dockerfile-GitLab +++ b/Dockerfile-GitLab @@ -1,16 +1,10 @@ FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE USER odoo -COPY --from=registry.gitlab.com/hibou-io/athene:node16 /opt/athene /opt/athene -COPY --from=hibou/flow /flow /flow +COPY --from=registry.gitlab.com/hibou-io/hibou-odoo/flow /flow /flow COPY --chown=104 entrypoint.sh /entrypoint.sh COPY --chown=104 . /opt/odoo/hibou-suite RUN rm /etc/odoo/odoo.conf \ && cp /opt/odoo/hibou-suite/debian/odoo.conf /etc/odoo/odoo.conf \ ; -EXPOSE 3000 -ENV SHELL=/bin/bash \ - THEIA_DEFAULT_PLUGINS=local-dir:/opt/athene/plugins -ENV USE_LOCAL_GIT true -