From b5791445d5b9178a8fd81465779576e53bd3c9f2 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Fri, 31 Aug 2018 09:47:09 +0200 Subject: [PATCH] [REF]Odoo 10 new base image with more OCA repositories included --- odoo/base.yml | 14 ++++++++++++-- odoo/golem/Dockerfile | 2 +- odoo/golem/Dockerfile.master | 12 ++---------- odoo/golem/Dockerfile.v3 | 12 ++---------- odoo/odoo/Dockerfile.ext.10 | 16 ++++++++++++++++ 5 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 odoo/odoo/Dockerfile.ext.10 diff --git a/odoo/base.yml b/odoo/base.yml index beb54ff..fa72ce4 100644 --- a/odoo/base.yml +++ b/odoo/base.yml @@ -74,12 +74,12 @@ services: POSTGRES_USER: odoo POSTGRES_PASSWORD: somethingToChange - odoo10: + odoobase10: init: true build: context: ./odoo dockerfile: Dockerfile.10 - image: registry.yaltik.net/odoo:yaltik10 + image: registry.yaltik.net/odoo:yaltikbase10 environment: DB_MAXCONN: 20 XMLRPC_PORT: 8069 @@ -92,6 +92,16 @@ services: POSTGRES_USER: odoo POSTGRES_PASSWORD: somethingToChange + odoo10: + init: true + extends: + file: base.yml + service: odoobase10 + build: + context: ./odoo + dockerfile: Dockerfile.ext.10 + image: registry.yaltik.net/odoo:yaltik10 + odoo11: init: true build: diff --git a/odoo/golem/Dockerfile b/odoo/golem/Dockerfile index ca5b779..d9b27a1 100644 --- a/odoo/golem/Dockerfile +++ b/odoo/golem/Dockerfile @@ -10,6 +10,6 @@ RUN git clone --depth 1 -b 8.0 https://github.com/OCA/community-data-files \ # Custom code WORKDIR /opt/odoo/custom-addons -RUN git clone --depth 1 -b 8.0 https://$GITEA_USER:$GITEA_PASS@git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik +RUN git clone --depth 1 -b 8.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik RUN git clone --depth 1 -b 2 https://git.yaltik.net/yaltik/golem.git golem WORKDIR /opt/odoo diff --git a/odoo/golem/Dockerfile.master b/odoo/golem/Dockerfile.master index b24c37a..4d7f5a9 100644 --- a/odoo/golem/Dockerfile.master +++ b/odoo/golem/Dockerfile.master @@ -1,20 +1,12 @@ FROM registry.yaltik.net/odoo:yaltik10 MAINTAINER Yaltik - Fabien Bourgeois -# Openupgradelib -RUN pip install --user openupgradelib - # Extra addons WORKDIR /opt/odoo/extra-addons -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files \ - && git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france \ - && git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact \ - && git clone --depth 1 -b 10.0 https://github.com/OCA/vertical-association \ - && git clone --depth 1 -b 10.0 https://github.com/OCA/web \ - && git clone --depth 1 -b 10.0 https://github.com/Openworx/backend_theme +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/vertical-association # Own GOLEM Code WORKDIR /opt/odoo/custom-addons -RUN git clone --depth 1 -b 10.0 https://$GITEA_USER:$GITEA_PASS@git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik +RUN git clone --depth 1 -b 10.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik RUN git clone --depth 1 -b stable https://git.yaltik.net/yaltik/golem.git golem WORKDIR /opt/odoo diff --git a/odoo/golem/Dockerfile.v3 b/odoo/golem/Dockerfile.v3 index b24c37a..4d7f5a9 100644 --- a/odoo/golem/Dockerfile.v3 +++ b/odoo/golem/Dockerfile.v3 @@ -1,20 +1,12 @@ FROM registry.yaltik.net/odoo:yaltik10 MAINTAINER Yaltik - Fabien Bourgeois -# Openupgradelib -RUN pip install --user openupgradelib - # Extra addons WORKDIR /opt/odoo/extra-addons -RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files \ - && git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france \ - && git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact \ - && git clone --depth 1 -b 10.0 https://github.com/OCA/vertical-association \ - && git clone --depth 1 -b 10.0 https://github.com/OCA/web \ - && git clone --depth 1 -b 10.0 https://github.com/Openworx/backend_theme +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/vertical-association # Own GOLEM Code WORKDIR /opt/odoo/custom-addons -RUN git clone --depth 1 -b 10.0 https://$GITEA_USER:$GITEA_PASS@git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik +RUN git clone --depth 1 -b 10.0 https://git.yaltik.net/Yaltik/yaltik_odoo_custom.git yaltik RUN git clone --depth 1 -b stable https://git.yaltik.net/yaltik/golem.git golem WORKDIR /opt/odoo diff --git a/odoo/odoo/Dockerfile.ext.10 b/odoo/odoo/Dockerfile.ext.10 new file mode 100644 index 0000000..85396c0 --- /dev/null +++ b/odoo/odoo/Dockerfile.ext.10 @@ -0,0 +1,16 @@ +FROM registry.yaltik.net/odoo:yaltikbase10 +MAINTAINER Yaltik - Fabien Bourgeois + +# External code +WORKDIR /opt/odoo/extra-addons +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/community-data-files +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/l10n-france +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/partner-contact +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/crm +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/queue +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/server-tools +RUN git clone --depth 1 -b 10.0 https://github.com/OCA/web +RUN git clone --depth 1 -b 10.0 https://github.com/Openworx/backend_theme + +# Addons dependencies +RUN pip install --user openupgradelib