Merge pull request #18 from rubencabrera/semantic-release

Auto semantic release

.travis.yml

@@ -5,14 +5,25 @@ 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=
+  - secure: wIhlZfS0UW2isH9f5Gn2A9Ws8guRG9LeahXc9C3Ww/TRnOnhunKDZPwusUNXprD23csg3f7g3j/DJpFssIQoynT2sVB6Xn66izBrDXF9l6RNvK88wbyZUws6cU45np9G74UJaRDz74NQpDOGHxfTEDWBoN2kTvegQxPUAMiwdifUjOg3jlmgRYdw8SZGnLre0iA6h1z5ztobJkzRL6QAnAJVVF03YTlSWSpxlAZtnmIrouH6TjbLMSapM7J0aPVGxYT11eQrySsnKpr69JovsCLXwh6YawrQxcajZzlMwi5AuolKULxuRSnsLYvLeI+hMcEodNIHgEcavi13ngITY6K0ADTwiMqDAxUVIIPydZDILcrGHUwze6zIMc0OWiJPNrYHCq3zMSQ7VY+/tH3Sk30XYQAWoRlWsHxmg46GEQq9XGjISP1RMxsolhykXbfgxbcwy52zYTfskPHC2N0eXE3Fhmq0dPPn+96qoeUywQjDm1o4nEn+VHN9j3bLrISftl20VuHAq0xs05MJ1Iyfay8NWDdfL1dkxqYUEvLfeQWkMFHNDh+KVVjMV9W+YBzzPA9Cma7/x80Z13QZNhT7VCV0ZjdDGpyIuEhkhmFCXscgRvOaLzKZWe5uyNpRdxeUFPXTlnimKg/amrrPL3ls6xoixkA5XyIrYJuL4/eXPGE=
 services:
 - docker
-script:
-- docker build -t "${TRAVIS_REPO_SLUG}:${TRAVIS_BRANCH}" .
-deploy:
-  provider: script
-  skip_cleanup: true
-  script: ./.travis/docker_push.bash
-  on:
-    tags: true
-    branch: 12
+jobs:
+  include:
+  - stage: build docker image
+    name: Test build docker image
+    script:
+    - docker build -t "${TRAVIS_REPO_SLUG}:${TRAVIS_BRANCH}" .
+  - stage: test
+    script: docker run  "${TRAVIS_REPO_SLUG}:${TRAVIS_BRANCH}" /opt/odoo/odoo-bin --version 
+  - stage: deploy
+    provider: script
+    skip_cleanup: true
+    script:
+      - nvm install lts/*
+      - npx semantic-release
+    on:
+      tags: true
+      branch: 12
+
+      # ver package.json a medias de https://revelry.co/semantic-release/

.travis/docker_push.bash

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

README.md

@@ -5,13 +5,30 @@ many are specific to local regulations and contradict themselves.
 
 For localisation, I am currently using Spain. If deemed useful, new
 branches and tags for images could be created for other countries,
-[open an issue](https://github.com/rubencabrera/odoo-docker/issues/new) if you need that, it's an easy win but I haven't 
+[open an issue][issue-link] if you need that, it's an easy win but I haven't 
 had to do it. 
 
-# Environment variables
+# Usage
+
+## Requirements
+
+You will need Docker and docker compose ([install docs][compose-install]).
+
+This repo includes docker compose files you can use to run Odoo completely
+on containers, mounting volumes for persistent data.
+
+Regarding resources, will vary heavily depending on the number of users and
+data, but a bare minimum with not much guarantees will be 1GB of RAM. It will
+be uch better with something above 4GB. 
+
+## Running with docker-compose
+
+Run `docker-compose up` in the root path. 
+
+## Environment variables
 
 Odoo uses a config file that is a bit of a pain with a docker 
-container. This images allows you to pass those config values in
+container. This images allow you to pass those config values in
 environment variables. Here's a list of the available ones, you can
 find them documented in the official Odoo documentation with the
 same name in lower case:
@@ -73,3 +90,25 @@ same name in lower case:
 | `XMLRPC_PORT` | `8069` |
 | `XMLRPCS` | `True` |
 | `XMLRPCS_PORT` | `8071` |
+
+
+# Getting help
+
+If you need help of have questions, [open an issue][issue-link] or get in
+contact. Please bear in mind this is not my current job and this image is
+working well enough for my needs, so I haven't alloted time to maintain it,
+but I'll do my best to help, especially if it's affecting your product. 
+
+
+# Ayuda en español
+
+Si necesitas ayuda en español usando esta imagen de Odoo o con algún tema
+relacionado, [abre un Issue][issue-link] o ponte en contacto conmigo.
+
+Por favor, ten en cuenta que este no es mi trabajo actualmente y que esta
+imagen funciona lo bastante bien como para no requerir mi tiempo, puede que
+tarde más de lo que esperas si tu problema es complicado, pero haré lo posible
+por ayudar. 
+
+[issue-link]: https://github.com/rubencabrera/odoo-docker/issues/new
+[compose-install]: https://docs.docker.com/compose/install/]

contrib/docker-compose.yml

@@ -1,8 +1,11 @@
-# Se necesita docker y docker-compose. Ejecutar con:
+# Compose file suitable for local development.
+# Run with:
 # docker-compose -f docker-compose.yml up
-# Se iniciará un contenedor con postgresql y otro con odoo. 
-# Para evitar conflictos con el puerto en local si ya hay postgres
-# se usa el 5433 en lugar del estándar 5432 de postgresql.
+# Will start a container with odoo and another one with postgres exposed
+# on port 5433 (in case you have a local postgres already running).
+# Also mounts a volume in your machine's /opt/odooo-docker/opt path mounted
+# where the container's code is. The projects are cloned there, so you can
+# use git to manage each container's repo branches. 
 ---
 version: '3.1'
 services:
@@ -13,29 +16,31 @@ services:
       - POSTGRES_USER=odoo
     ports:
       - "5433:5432"
+    restart: always
     volumes:
       - data_storage:/var/lib/postgresql/data
   odoo12:
     container_name: odoo12
     depends_on:
       - db
+    environment:
+      - ADMIN_PASSWD=FIXME
+      - DB_FILTER=False
     image: "rubencabrera/odoo-docker:12.0.4"
     ports:
       - "8169:8069"
       - "8171:8071"
       - "8172:8072"
-    environment:
-      - ADMIN_PASSWD=FIXME
-      - DB_FILTER=False
+    restart: always
     volumes:
-      - odoo12_data:/var/lib/odoo
       - codigo:/opt
+      - odoo12_data:/var/lib/odoo
 volumes:
-  data_storage:
-  odoo12_data:
   codigo:
     driver: local
     driver_opts:
       o: bind
       type: none
       device: /opt/odoo-docker/opt    # This is where the code will live.
+  data_storage:
+  odoo12_data:

docker-compose.yml

@@ -7,12 +7,13 @@
 version: '3.1'
 services:
   db:
-    image: postgres:9.6
     environment:
       - POSTGRES_PASSWORD=odoo
       - POSTGRES_USER=odoo
+    image: postgres:9.6
     ports:
       - "5433:5432"
+    restart: always
     volumes:
       - data_storage:/var/lib/postgresql/data
   odoo12:
@@ -24,6 +25,7 @@ services:
       - "8069:8069"
       - "8071:8071"
       - "8072:8072"
+    restart: always
     volumes:
       - odoo_data:/var/lib/odoo
 volumes: