Move athene upstream

This commit is contained in:
Jared Kipe
2023-12-14 09:45:15 -08:00
parent 588171aab6
commit 69db12f8f7
2 changed files with 1 additions and 13 deletions

View File

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

View File

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