Yaltik/docker_images
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[REF]Odoo 10 new base image with more OCA repositories included

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-08-31 09:47:09 +02:00
parent ba2d801f57
commit b5791445d5
5 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
odoo/base.yml
View File

@ -74,12 +74,12 @@ services:
POSTGRES_USER: odoo POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange POSTGRES_PASSWORD: somethingToChange
odoo10: odoobase10:
init: true init: true
build: build:
context: ./odoo context: ./odoo
dockerfile: Dockerfile.10 dockerfile: Dockerfile.10
image: registry.yaltik.net/odoo:yaltik10 image: registry.yaltik.net/odoo:yaltikbase10
environment: environment:
DB_MAXCONN: 20 DB_MAXCONN: 20
XMLRPC_PORT: 8069 XMLRPC_PORT: 8069
@ -92,6 +92,16 @@ services:
POSTGRES_USER: odoo POSTGRES_USER: odoo
POSTGRES_PASSWORD: somethingToChange 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: odoo11:
init: true init: true
build: build:

2
odoo/golem/Dockerfile
View File

@ -10,6 +10,6 @@ RUN git clone --depth 1 -b 8.0 https://github.com/OCA/community-data-files \
# Custom code # Custom code
WORKDIR /opt/odoo/custom-addons 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 RUN git clone --depth 1 -b 2 https://git.yaltik.net/yaltik/golem.git golem
WORKDIR /opt/odoo WORKDIR /opt/odoo

12
odoo/golem/Dockerfile.master
View File

@ -1,20 +1,12 @@
FROM registry.yaltik.net/odoo:yaltik10 FROM registry.yaltik.net/odoo:yaltik10
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com> MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
# Openupgradelib
RUN pip install --user openupgradelib
# Extra addons # Extra addons
WORKDIR /opt/odoo/extra-addons 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/vertical-association
&& 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
# Own GOLEM Code # Own GOLEM Code
WORKDIR /opt/odoo/custom-addons 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 RUN git clone --depth 1 -b stable https://git.yaltik.net/yaltik/golem.git golem
WORKDIR /opt/odoo WORKDIR /opt/odoo

12
odoo/golem/Dockerfile.v3
View File

@ -1,20 +1,12 @@
FROM registry.yaltik.net/odoo:yaltik10 FROM registry.yaltik.net/odoo:yaltik10
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com> MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
# Openupgradelib
RUN pip install --user openupgradelib
# Extra addons # Extra addons
WORKDIR /opt/odoo/extra-addons 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/vertical-association
&& 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
# Own GOLEM Code # Own GOLEM Code
WORKDIR /opt/odoo/custom-addons 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 RUN git clone --depth 1 -b stable https://git.yaltik.net/yaltik/golem.git golem
WORKDIR /opt/odoo WORKDIR /opt/odoo

16
odoo/odoo/Dockerfile.ext.10 Normal file
View File

@ -0,0 +1,16 @@
FROM registry.yaltik.net/odoo:yaltikbase10
MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
# 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