Merge pull request #2 from rubencabrera/12-dev

12 dev

.travis.yml

@@ -1,7 +1,17 @@
 language: bash
 os: linux
 sudo: required
+env:
+  global:
+  - secure: TDAVU5ZV+gR6SfUFTHay+l7/EY6La2HfPfA4lV5pyn+B1xdufLBnzxK89OGyxFDjNUUwsvwmA1iKRODj23Qktd38Ixt+JxfBmPoJkgE7qdDxFKS2KSPsKT/dYqyI8Z/Ja0xi45HItoRlIO7VoyaPI4QkaWH9PdG1SZe7rPUbAhfi703pt74gJwOUwXAPT+ltmgRW3X9D3NH4UwcLDZdc24p0muQfa5+3Tyo0BwpPDZq3XyaUmaanHVdNqOcrEtWVdst6HyyyV458MMc58mH0UE/NcZgGWjHV7GXjMl9OXINA0+nV//jOkhSmrWSPXAhOPdlmNNg9bWFuIwI7UzVWQ+tUEfzDj1xamXniRECVwuD7/oU+wAswHcWj2/p5iUQ4aMf6pfxe/ECgvMC8HdzXzafwEJ9cIYsH32REq203eNNL6E/Gk7i5iY75f4XcAjMwop0X6khqg1V3APkPrOnt5uOvz5dmykMS306OKe6ZcO0XiNuM6Gn4yVtfZ59wLxTCJn6PJpEHQB20DNI4NN/Y528ESqRDrHOKl8rJuPRbTspfjxB7HrmL3EW5ynZ+IL2WDfC9e+S1+1jtgylEF1swCgpqg+qpfHpZLdwKZysLg+p3buVBAMDhWG5icF7V3cR6ACsjFNXbl98jk20EfLdO4bO1aJJz2OcVMYf5BuU8ZsE=
+  - secure: o235uaW/z0gHhXFI46MeMpfsjVoVJTClm3N7X8Fcv3qfHC4euxNWvRSkOrh11ZqC6tHjH3LLb5IV4HmGiPShjCcSXuxlOiTQeVciNihsjLybule6kmypO8TJWuJPi3DHVBr/naUBnIyUzA2vDedJ0Va3pzSU+ZyAv8izR7GQ/HAEBnri48JKP08bMkYONp5EDyHA5tTqTPJYKBhZsi8pdcFl7Ob5t6OWZuM1UMWyuDMgzVhUVnq53Ont5qFMVzgu+icGtrFIP6eEjI7zVUTpNTqvVaoesy7peY3gBm55401onypQd2KJNd4gyAiuv3kQtEyoL4ln0GvoaDl93Pi8hu4XKRX2HALI+jJi5j4HwmMSaVYas5O2O7HVGXDuHyhFw6t18hsYaiL0Ol9FF/k7g4ufTKBfszvLIVmQVRKrq7xULYDrlwf7I5r/B15WUqgKumdktsp82y7NHuhf89eY40t2R6G5QeqojfabPXxprnZpHAISbxFgoNQGQmswW5D7YxMJnX7HAUR2fxgyvq5THGDwhh47vRdemgzIK+VMAEwip1NTF42Sl2Y9Uyx2Vs6gAAzPPyf7gwTJQjc3OiyaY93Mea/O/hllLKLAezQBQTBzzsVUdflNrXgjKf/uGDwh0ZJhhaKsDmT+pf7o4R8hddHv6numhSClLG087Kdm5AI=
 services:
 - docker
 script:
-  - docker build -t "${TRAVIS_REPO_SLUG}" .
+- docker build -t "${TRAVIS_REPO_SLUG}:${TRAVIS_BRANCH}" .
+deploy:
+  provider: script
+  script: ./.travis/docker_push.bash
+  on:
+    tags: true
+    branch: 12

.travis/docker_push.bash

@@ -0,0 +1,4 @@
+#! /bin/bash
+
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_LOGIN" --password-stdin
+docker push "${TRAVIS_REPO_SLUG}:${TRAVIS_BRANCH}";

Dockerfile

@@ -4,7 +4,6 @@ MAINTAINER Rubén Cabrera Martínez <[email protected]>
 EXPOSE 8069 8071 8072
 ENV LANG C.UTF-8
 
-# Prueba por si acaso la 10 sólo va en el longpolling
 RUN apt-get update \
     && apt-get install \
     software-properties-common \
@@ -88,20 +87,23 @@ RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkh
 RUN dpkg -i wkhtmltox_0.12.5-1.stretch_amd64.deb
 
 RUN pip3 install \
-        openupgradelib \
+        backports.functools_lru_cache \
+	bokeh \
+        cssutils \
+        dbfpy \
+        html2text \
+        libsass \
 	odoorpc \
-        unidecode \
-	zeep \
+	ofxparse \
+        openupgradelib \
+        num2words \
 	pandas \
         psycogreen \
-        xlrd \
-	ofxparse \
-        cssutils \
 	twilio \
-	zklib \
-        backports.functools_lru_cache \
-	bokeh \
-        dbfpy
+        unidecode \
+        xlrd \
+	zeep \
+	zklib
 RUN mkdir /opt/odoo; mkdir /var/log/odoo; mkdir /var/lib/odoo; mkdir /opt/repos && mkdir /opt/repos/oca
 RUN useradd --home /opt/odoo --shell /bin/bash odoo
 RUN chown -R odoo:odoo /opt/odoo; chown -R odoo:odoo /var/lib/odoo; \
@@ -177,13 +179,17 @@ COPY ./odoo-server.conf /opt/config/odoo-server.conf
 ENV OPENERP_SERVER /opt/config/odoo-server.conf
 
 RUN chown -R odoo:odoo /opt/config
-# Extra-addons is where odoo10 places user installed addons
-#RUN mkdir -p /mnt/extra-addons \
-        #&& chown -R odoo /mnt/extra-addons
 RUN sed -i '/^#.*Storage/s/^#//' /etc/systemd/journald.conf
-RUN mkdir -p /var/lib/odoo \
-        && chown -R odoo /var/lib/odoo
-VOLUME ["/var/lib/odoo"]
+#RUN mkdir -p /var/lib/odoo \
+    #&& chown -R odoo /var/lib/odoo
+#VOLUME ["/var/lib/odoo"]
+# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons
+# for users addons
+RUN mkdir -p /mnt/extra-addons \
+    && chown -R odoo:odoo /mnt/extra-addons \
+    && chown -R odoo:odoo /var/lib/odoo
+VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
+
 COPY ./entrypoint.sh /opt/entrypoint.sh
 RUN chown -R odoo:odoo /opt/entrypoint.sh
 RUN ["chmod", "+x", "/opt/entrypoint.sh"]

docker-compose.yml

@@ -19,7 +19,7 @@ services:
     container_name: praxya_odoo10
     depends_on:
       - db
-    image: "praxya/odoo:10"
+    image: "rubencabrera/odoo:12"
     ports: 
       - "8069:8069"
       - "8071:8071"