mirror of
https://gitlab.com/hibou-io/hibou-odoo/suite.git
synced 2025-01-20 12:37:31 +02:00
Merge branch 'mig/12.0/delivery_gso' into '12.0'
mig/12.0/delivery_gso into 12.0 See merge request hibou-io/hibou-odoo/suite!594
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -39,3 +39,6 @@
|
||||
[submodule "external/hibou-oca/connector-magento"]
|
||||
path = external/hibou-oca/connector-magento
|
||||
url = https://github.com/hibou-io/oca-connector-magento.git
|
||||
[submodule "external/hibou-oca/purchase-workflow"]
|
||||
path = external/hibou-oca/purchase-workflow
|
||||
url = https://github.com/hibou-io/oca-purchase-workflow.git
|
||||
|
||||
15
Dockerfile
15
Dockerfile
@@ -1,5 +1,20 @@
|
||||
FROM hibou/hibou-odoo:12.0
|
||||
|
||||
# All this just for openupgradelib
|
||||
USER 0
|
||||
RUN set -x; \
|
||||
apt update && apt install -y git \
|
||||
&& pip install git+git://github.com/OCA/openupgradelib.git \
|
||||
# Clean Up
|
||||
&& apt remove -y git \
|
||||
&& apt autoremove -y \
|
||||
&& rm -rf /root/.cache \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& rm -rf /tmp/* \
|
||||
;
|
||||
|
||||
USER 104
|
||||
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 \
|
||||
|
||||
@@ -1,5 +1,20 @@
|
||||
FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE
|
||||
|
||||
# All this just for openupgradelib
|
||||
USER 0
|
||||
RUN set -x; \
|
||||
apt update && apt install -y git \
|
||||
&& pip install git+git://github.com/OCA/openupgradelib.git \
|
||||
# Clean Up
|
||||
&& apt remove -y git \
|
||||
&& apt autoremove -y \
|
||||
&& rm -rf /root/.cache \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& rm -rf /tmp/* \
|
||||
;
|
||||
|
||||
USER 104
|
||||
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 \
|
||||
|
||||
2
external/hibou-oca/connector-magento
vendored
2
external/hibou-oca/connector-magento
vendored
Submodule external/hibou-oca/connector-magento updated: 055dafb0d7...3433a2395b
1
external/hibou-oca/purchase-workflow
vendored
Submodule
1
external/hibou-oca/purchase-workflow
vendored
Submodule
Submodule external/hibou-oca/purchase-workflow added at cafb62abc9
1
purchase_exception
Symbolic link
1
purchase_exception
Symbolic link
@@ -0,0 +1 @@
|
||||
./external/hibou-oca/purchase-workflow/purchase_exception
|
||||
1
purchase_minimum_amount
Symbolic link
1
purchase_minimum_amount
Symbolic link
@@ -0,0 +1 @@
|
||||
./external/hibou-oca/purchase-workflow/purchase_minimum_amount
|
||||
Reference in New Issue
Block a user