Merge pull request #217 from rubencabrera/14

14

.gitignore

@@ -1,2 +1 @@
-opt/odoo/
-opt/repos/
+opt/**/

Dockerfile

@@ -1,7 +1,5 @@
-# DOCKER image to run odoo 13 with Odoo Community Backports and OCA addons
-# WARNING: branch 13 is not taken care of and has never worked, this is a
-# non functional release. Do not use.
-FROM rubencabrera/odoo-base-image:13.0.0
+# DOCKER image to run odoo 14 with Odoo Community Backports and OCA addons
+FROM rubencabrera/odoo-base-image:14.1.1
 MAINTAINER Rubén Cabrera Martínez <[email protected]>
 EXPOSE 8069 8071 8072
 ENV LANG C.UTF-8
@@ -20,69 +18,69 @@ RUN chown -R odoo:odoo /opt/odoo; chown -R odoo:odoo /var/lib/odoo; \
 # comandos que se indiquen después.
 USER odoo
 WORKDIR /opt/odoo
-RUN git clone --branch 12.0 --depth 1 https://github.com/oca/ocb.git /opt/odoo
+RUN git clone --branch 14.0 --depth 1 https://github.com/oca/ocb.git /opt/odoo
 
 # Odoo Community Association repositories
 WORKDIR /opt/repos/oca
-RUN git clone --branch 12.0 --depth 1 https://github.com/oca/account-analytic.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/account-budgeting.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/account-closing.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/account-consolidation.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/account-invoice-reporting.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/account-invoicing.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/account-financial-reporting.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/account-financial-tools.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/account-fiscal-rule.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/account-payment.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/bank-payment.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/bank-statement-import.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/bank-statement-reconcile.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/commission.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/community-data-files.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/connector-telephony.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/contract.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/crm.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/data-protection.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/e-commerce.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/event.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/hr.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/hr-timesheet.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/intrastat.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/knowledge.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/l10n-spain.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/management-system.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/manufacture.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/manufacture-reporting.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/margin-analysis.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/operating-unit.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/partner-contact.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/pos.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/product-attribute.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/product-variant.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/project.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/project-reporting.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/purchase-reporting.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/purchase-workflow.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/reporting-engine.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/rma.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/sale-financial.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/sale-reporting.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/sale-workflow.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/server-tools.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/server-ux.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/social.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/stock-logistics-barcode.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/stock-logistics-tracking.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/stock-logistics-transport.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/stock-logistics-warehouse.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/stock-logistics-workflow.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/web.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/website.git; \
-    git clone --branch 12.0 --depth 1 https://github.com/oca/website-cms.git;
+RUN git clone --branch 14.0 --depth 1 https://github.com/oca/account-analytic.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/account-budgeting.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/account-closing.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/account-consolidation.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/account-invoice-reporting.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/account-invoicing.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/account-financial-reporting.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/account-financial-tools.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/account-fiscal-rule.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/account-payment.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/bank-payment.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/bank-statement-import.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/bank-statement-reconcile.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/commission.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/community-data-files.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/connector-telephony.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/contract.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/crm.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/data-protection.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/e-commerce.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/event.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/hr.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/hr-timesheet.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/intrastat.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/knowledge.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/l10n-spain.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/management-system.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/manufacture.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/manufacture-reporting.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/margin-analysis.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/operating-unit.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/partner-contact.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/pos.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/product-attribute.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/product-variant.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/project.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/project-reporting.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/purchase-reporting.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/purchase-workflow.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/reporting-engine.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/rma.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/sale-financial.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/sale-reporting.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/sale-workflow.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/server-tools.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/server-ux.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/social.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/stock-logistics-barcode.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/stock-logistics-tracking.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/stock-logistics-transport.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/stock-logistics-warehouse.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/stock-logistics-workflow.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/web.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/website.git; \
+    git clone --branch 14.0 --depth 1 https://github.com/oca/website-cms.git;
 
 
 WORKDIR /opt/repos/other
-RUN git clone --branch 12.9.2 --depth 1 https://github.com/rubencabrera/odoo-addons.git rubencabrera-odoo-addons;
+RUN git clone --branch 14 --depth 1 https://github.com/rubencabrera/odoo-addons.git rubencabrera-odoo-addons;
 
 # Configuración
 WORKDIR /opt

contrib/docker-compose.yml

@@ -10,7 +10,7 @@
 version: '3.1'
 services:
   db:
-    image: postgres:9.6.23
+    image: postgres:9.6.24
     environment:
       - POSTGRES_PASSWORD=odoo
       - POSTGRES_USER=odoo
@@ -19,22 +19,22 @@ services:
     restart: always
     volumes:
       - data_storage:/var/lib/postgresql/data
-  odoo12:
-    container_name: odoo12
+  odoo14:
+    container_name: odoo14
     depends_on:
       - db
     environment:
       - ADMIN_PASSWD=FIXME
       - DB_FILTER=False
-    image: "rubencabrera/odoo-docker:12.12.0"
+    image: "rubencabrera/odoo-docker:14.1.3"
     ports:
       - "8169:8069"
       - "8171:8071"
       - "8172:8072"
     restart: always
     volumes:
       - codigo:/opt
-      - odoo12_data:/var/lib/odoo
+      - odoo14_data:/var/lib/odoo
 volumes:
   codigo:
     driver: local
@@ -43,4 +43,4 @@ volumes:
       type: none
       device: /opt/odoo-docker/opt    # This is where the code will live.
   data_storage:
-  odoo12_data:
+  odoo14_data:

docker-compose.yml

@@ -16,11 +16,11 @@ services:
     restart: always
     volumes:
       - data_storage:/var/lib/postgresql/data
-  odoo12:
-    container_name: odoo12
+  odoo14:
+    container_name: odoo14
     depends_on:
       - db
-    image: "rubencabrera/odoo-docker:12.12.0"
+    image: "rubencabrera/odoo-docker:14.1.3"
     ports: 
       - "8069:8069"
       - "8071:8071"