From 170bfea3d175c826ef8d6e7416999f94abe910f2 Mon Sep 17 00:00:00 2001 From: Andrew Latham Date: Sun, 31 Mar 2024 16:19:12 -0600 Subject: [PATCH 1/2] Update license.md link to trunk --- odoo/license.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo/license.md b/odoo/license.md index 31c831770..785f6a2de 100644 --- a/odoo/license.md +++ b/odoo/license.md @@ -1 +1 @@ -View [license information](https://raw.githubusercontent.com/odoo/odoo/14.0/LICENSE) for the software contained in this image. +View [license information](https://github.com/odoo/odoo/blob/master/LICENSE) for the software contained in this image. From cb0910e55d5bd677d1c7d9726c4d228fec0b0048 Mon Sep 17 00:00:00 2001 From: Andrew Latham Date: Sun, 31 Mar 2024 16:20:06 -0600 Subject: [PATCH 2/2] Update content.md Update examples with 17 vs 16 --- odoo/content.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/odoo/content.md b/odoo/content.md index c9bb34018..aecb5a61b 100644 --- a/odoo/content.md +++ b/odoo/content.md @@ -63,7 +63,7 @@ The default configuration file for the server (located at `/etc/odoo/odoo.conf`) $ docker run -v /path/to/config:/etc/odoo -p 8069:8069 --name odoo --link db:db -t %%IMAGE%% ``` -Please use [this configuration template](https://github.com/odoo/docker/blob/master/16.0/odoo.conf) to write your custom configuration as we already set some arguments for running Odoo inside a Docker container. +Please use [this configuration template](https://github.com/odoo/docker/blob/master/17.0/odoo.conf) to write your custom configuration as we already set some arguments for running Odoo inside a Docker container. You can also directly specify Odoo arguments inline. Those arguments must be given after the keyword `--` in the command-line, as follows @@ -107,7 +107,7 @@ The simplest `docker-compose.yml` file would be: version: '3.1' services: web: - image: %%IMAGE%%:16.0 + image: %%IMAGE%%:17.0 depends_on: - db ports: @@ -126,7 +126,7 @@ If the default postgres credentials does not suit you, tweak the environment var version: '3.1' services: web: - image: %%IMAGE%%:16.0 + image: %%IMAGE%%:17.0 depends_on: - mydb ports: @@ -154,7 +154,7 @@ Here's a last example showing you how to version: '3.1' services: web: - image: %%IMAGE%%:16.0 + image: %%IMAGE%%:17.0 depends_on: - db ports: @@ -199,7 +199,7 @@ Odoo images are updated on a regular basis to make them use recent releases (a n Suppose you created a database from an Odoo instance named old-odoo, and you want to access this database from a new Odoo instance named new-odoo, e.g. because you've just downloaded a newer Odoo image. -By default, Odoo 16.0 uses a filestore (located at `/var/lib/odoo/filestore/`) for attachments. You should restore this filestore in your new Odoo instance by running +By default, Odoo 16.0+ uses a filestore (located at `/var/lib/odoo/filestore/`) for attachments. You should restore this filestore in your new Odoo instance by running ```console $ docker run --volumes-from old-odoo -p 8070:8069 --name new-odoo --link db:db -t %%IMAGE%%