audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mig/12.0/delivery_gso' into '12.0'

Browse Source 
mig/12.0/delivery_gso into 12.0

See merge request hibou-io/hibou-odoo/suite!594
This commit is contained in:
Jared Kipe
2020-11-05 18:26:14 +00:00
parent abf762a8ac a0bc284347
commit d5d247e317
8 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -39,3 +39,6 @@
[submodule "external/hibou-oca/connector-magento"] [submodule "external/hibou-oca/connector-magento"]
path = external/hibou-oca/connector-magento path = external/hibou-oca/connector-magento
url = https://github.com/hibou-io/oca-connector-magento.git 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
View File

@@ -1,5 +1,20 @@
FROM hibou/hibou-odoo:12.0 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 COPY --chown=104 . /opt/odoo/hibou-suite
RUN rm /etc/odoo/odoo.conf \ RUN rm /etc/odoo/odoo.conf \
&& cp /opt/odoo/hibou-suite/debian/odoo.conf /etc/odoo/odoo.conf \ && cp /opt/odoo/hibou-suite/debian/odoo.conf /etc/odoo/odoo.conf \

15
Dockerfile-GitLab
View File

@@ -1,5 +1,20 @@
FROM registry.gitlab.com/hibou-io/hibou-odoo/odoo:RELEASE 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 COPY --chown=104 . /opt/odoo/hibou-suite
RUN rm /etc/odoo/odoo.conf \ RUN rm /etc/odoo/odoo.conf \
&& cp /opt/odoo/hibou-suite/debian/odoo.conf /etc/odoo/odoo.conf \ && cp /opt/odoo/hibou-suite/debian/odoo.conf /etc/odoo/odoo.conf \

1
auditlog Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/server-tools/auditlog

2
external/hibou-oca/connector-magento vendored

Submodule external/hibou-oca/connector-magento updated: 055dafb0d7...3433a2395b

1
external/hibou-oca/purchase-workflow vendored Submodule

Submodule external/hibou-oca/purchase-workflow added at cafb62abc9

1
purchase_exception Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/purchase-workflow/purchase_exception

1
purchase_minimum_amount Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/purchase-workflow/purchase_minimum_amount