Docker Library Bot 4 gadi atpakaļ
vecāks
revīzija
cf2ca88b50
4 mainītis faili ar 56 papildinājumiem un 21 dzēšanām
  1. 2 2
      lightstreamer/README.md
  2. 4 2
      neo4j/README.md
  3. 49 16
      odoo/README.md
  4. 1 1
      r-base/README.md

+ 2 - 2
lightstreamer/README.md

@@ -30,8 +30,8 @@ WARNING:
 -	[`7.0.3-jdk11-openjdk`, `7.0-jdk11-openjdk`, `7.0.3-jdk11`, `7.0-jdk11`, `7.0.3`, `7.0`](https://github.com/Lightstreamer/Docker/blob/f3aaece15133b9405aef20c5d378c5a83aba7585/7.0/jdk11/Dockerfile)
 -	[`7.1.2-jdk8-openjdk`, `7.1-jdk8-openjdk`, `7.1.2-jdk8`, `7.1-jdk8`](https://github.com/Lightstreamer/Docker/blob/7bdd2632e1cae0bf838899d591aadb2dd128c41a/7.1/jdk8/Dockerfile)
 -	[`7.1.2-jdk11-openjdk`, `7.1-jdk11-openjdk`, `7.1.2-jdk11`, `7.1-jdk11`, `7.1.2`, `7.1`](https://github.com/Lightstreamer/Docker/blob/7bdd2632e1cae0bf838899d591aadb2dd128c41a/7.1/jdk11/Dockerfile)
--	[`7.2.0-jdk11-openjdk`, `7.2-jdk11-openjdk`, `7-jdk11-openjdk`, `7.2.0-jdk11`, `7.2-jdk11`, `7-jdk11`, `7.2.0`, `7.2`, `latest`](https://github.com/Lightstreamer/Docker/blob/9b286d6ad71126b2848b76a56d75f1e7cfb8d4ab/7.2/jdk11/Dockerfile)
--	[`7.2.0-jdk8-openjdk`, `7.2-jd8-openjdk`, `7-jdk8-openjdk`, `7.2.0-jdk8`, `7.2-jdk8`, `7-jdk8`](https://github.com/Lightstreamer/Docker/blob/9b286d6ad71126b2848b76a56d75f1e7cfb8d4ab/7.2/jdk8/Dockerfile)
+-	[`7.2.0-jdk11-openjdk`, `7.2-jdk11-openjdk`, `7-jdk11-openjdk`, `7.2.0-jdk11`, `7.2-jdk11`, `7-jdk11`, `7.2.0`, `7.2`, `latest`](https://github.com/Lightstreamer/Docker/blob/fe38e8a5b87c4cb29b964a49f9ce7f0a50752b48/7.2/jdk11/Dockerfile)
+-	[`7.2.0-jdk8-openjdk`, `7.2-jd8-openjdk`, `7-jdk8-openjdk`, `7.2.0-jdk8`, `7.2-jdk8`, `7-jdk8`](https://github.com/Lightstreamer/Docker/blob/fe38e8a5b87c4cb29b964a49f9ce7f0a50752b48/7.2/jdk8/Dockerfile)
 
 # Quick reference (cont.)
 

+ 4 - 2
neo4j/README.md

@@ -24,8 +24,10 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`4.3.2`, `4.3.2-community`, `4.3`, `4.3-community`, `community`, `latest`](https://github.com/neo4j/docker-neo4j-publish/blob/aaa672f9ae8f70052d58bac7c7bf2a6e8e9f980f/4.3.2/community/Dockerfile)
--	[`4.3.2-enterprise`, `4.3-enterprise`, `enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/aaa672f9ae8f70052d58bac7c7bf2a6e8e9f980f/4.3.2/enterprise/Dockerfile)
+-	[`4.3.3`, `4.3.3-community`, `4.3`, `4.3-community`, `community`, `latest`](https://github.com/neo4j/docker-neo4j-publish/blob/d9521e9df2d6df4c897e773454222c317052d062/4.3.3/community/Dockerfile)
+-	[`4.3.3-enterprise`, `4.3-enterprise`, `enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/d9521e9df2d6df4c897e773454222c317052d062/4.3.3/enterprise/Dockerfile)
+-	[`4.3.2`, `4.3.2-community`](https://github.com/neo4j/docker-neo4j-publish/blob/aaa672f9ae8f70052d58bac7c7bf2a6e8e9f980f/4.3.2/community/Dockerfile)
+-	[`4.3.2-enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/aaa672f9ae8f70052d58bac7c7bf2a6e8e9f980f/4.3.2/enterprise/Dockerfile)
 -	[`4.3.1`, `4.3.1-community`](https://github.com/neo4j/docker-neo4j-publish/blob/a2080428f59ab41471c6d87728cad46a7316ceab/4.3.1/community/Dockerfile)
 -	[`4.3.1-enterprise`](https://github.com/neo4j/docker-neo4j-publish/blob/a2080428f59ab41471c6d87728cad46a7316ceab/4.3.1/enterprise/Dockerfile)
 -	[`4.3.0`, `4.3.0-community`](https://github.com/neo4j/docker-neo4j-publish/blob/4e1de71ba0017d996c292730663fd40d14d3e983/4.3.0/community/Dockerfile)

+ 49 - 16
odoo/README.md

@@ -49,7 +49,7 @@ WARNING:
 
 # What is Odoo?
 
-Odoo, formerly known as OpenERP, is a suite of open-source business apps written in Python and released under the AGPL license. This suite of applications covers all business needs, from Website/Ecommerce down to manufacturing, inventory and accounting, all seamlessly integrated. It is the first time ever a software editor managed to reach such a functional coverage. Odoo is the most installed business software in the world. Odoo is used by 2.000.000 users worldwide ranging from very small companies (1 user) to very large ones (300 000 users).
+Odoo, formerly known as OpenERP, is a suite of open-source business apps written in Python and released under the LGPL license. This suite of applications covers all business needs, from Website/Ecommerce down to manufacturing, inventory and accounting, all seamlessly integrated. It is the first time ever a software editor managed to reach such a functional coverage. Odoo is the most installed business software in the world. Odoo is used by 2.000.000 users worldwide ranging from very small companies (1 user) to very large ones (300 000 users).
 
 > [www.odoo.com](https://www.odoo.com)
 
@@ -62,7 +62,7 @@ This image requires a running PostgreSQL server.
 ## Start a PostgreSQL server
 
 ```console
-$ docker run -d -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo -e POSTGRES_DB=postgres --name db postgres:10
+$ docker run -d -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo -e POSTGRES_DB=postgres --name db postgres:13
 ```
 
 ## Start an Odoo instance
@@ -80,6 +80,24 @@ $ docker stop odoo
 $ docker start -a odoo
 ```
 
+## Use named volumes to preserve data
+
+When the Odoo container is created like described above, the odoo filestore is created inside the container. If the container is removed, the filestore is lost. The preferred way to prevent that is by using a Docker named [volume](https://docs.docker.com/storage/volumes/).
+
+```console
+$ docker run -v odoo-data:/var/lib/odoo -d -p 8069:8069 --name odoo --link db:db -t odoo
+```
+
+With the above command, the volume named `odoo-data` will persist even if the container is removed and can be re-used by issuing the same command.
+
+The path `/var/lib/odoo` used as the mount point of the volume must match the odoo `data_dir` in the config file or as CLI parameters.
+
+Note that the same principle applies to the Postgresql container and a named volume can be used to preserve the database when the container is removed. So the database container could be started like this (before the odoo container):
+
+```console
+$ docker run -d -v odoo-db:/var/lib/postgresql/data -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo -e POSTGRES_DB=postgres --name db postgres:13
+```
+
 ## Stop and restart a PostgreSQL server
 
 When a PostgreSQL server is restarted, the Odoo instances linked to that server must be restarted as well because the server address has changed and the link is thus broken.
@@ -94,7 +112,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 odoo
 ```
 
-Please use [this configuration template](https://github.com/odoo/docker/blob/master/12.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/14.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
 
@@ -133,16 +151,16 @@ Tweak these environment variables to easily connect to a postgres server:
 The simplest `docker-compose.yml` file would be:
 
 ```yml
-version: '2'
+version: '3.1'
 services:
   web:
-    image: odoo:12.0
+    image: odoo:14.0
     depends_on:
       - db
     ports:
       - "8069:8069"
   db:
-    image: postgres:10
+    image: postgres:13
     environment:
       - POSTGRES_DB=postgres
       - POSTGRES_PASSWORD=odoo
@@ -152,10 +170,10 @@ services:
 If the default postgres credentials does not suit you, tweak the environment variables:
 
 ```yml
-version: '2'
+version: '3.1'
 services:
   web:
-    image: odoo:12.0
+    image: odoo:14.0
     depends_on:
       - mydb
     ports:
@@ -165,20 +183,25 @@ services:
     - USER=odoo
     - PASSWORD=myodoo
   mydb:
-    image: postgres:10
+    image: postgres:13
     environment:
       - POSTGRES_DB=postgres
       - POSTGRES_PASSWORD=myodoo
       - POSTGRES_USER=odoo
 ```
 
-Here's a last example showing you how to mount custom addons, how to use a custom configuration file and how to use volumes for the Odoo and postgres data dir:
+Here's a last example showing you how to
+
+-	mount custom addons located in `./addons`
+-	use a custom configuration file located in `.config/odoo.conf`
+-	use named volumes for the Odoo and postgres data dir
+-	use a `secrets` file named `odoo_pg_pass` that contains the postgreql password shared by both services
 
 ```yml
-version: '2'
+version: '3.1'
 services:
   web:
-    image: odoo:12.0
+    image: odoo:14.0
     depends_on:
       - db
     ports:
@@ -187,18 +210,28 @@ services:
       - odoo-web-data:/var/lib/odoo
       - ./config:/etc/odoo
       - ./addons:/mnt/extra-addons
+    environment:
+      - PASSWORD_FILE=/run/secrets/postgresql_password
+    secrets:
+      - postgresql_password
   db:
-    image: postgres:10
+    image: postgres:13
     environment:
       - POSTGRES_DB=postgres
-      - POSTGRES_PASSWORD=odoo
+      - POSTGRES_PASSWORD_FILE=/run/secrets/postgresql_password
       - POSTGRES_USER=odoo
       - PGDATA=/var/lib/postgresql/data/pgdata
     volumes:
       - odoo-db-data:/var/lib/postgresql/data/pgdata
+    secrets:
+      - postgresql_password
 volumes:
   odoo-web-data:
   odoo-db-data:
+
+secrets:
+  postgresql_password:
+    file: odoo_pg_pass
 ```
 
 To start your Odoo instance, go in the directory of the `docker-compose.yml` file you created from the previous examples and type:
@@ -213,7 +246,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 12.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 14.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 odoo
@@ -223,7 +256,7 @@ You can also simply prevent Odoo from using the filestore by setting the system
 
 # License
 
-View [license information](https://raw.githubusercontent.com/odoo/odoo/12.0/LICENSE) for the software contained in this image.
+View [license information](https://raw.githubusercontent.com/odoo/odoo/14.0/LICENSE) for the software contained in this image.
 
 As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained).
 

+ 1 - 1
r-base/README.md

@@ -24,7 +24,7 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`4.1.0`, `latest`](https://github.com/rocker-org/rocker/blob/bc5f41cd3464bf18c571e7ff35383aab08b8ee71/r-base/4.1.0/Dockerfile)
+-	[`4.1.1`, `latest`](https://github.com/rocker-org/rocker/blob/a2dc8a7816d7cf8adab20ee9baf7d4ae283b4b92/r-base/4.1.1/Dockerfile)
 
 # Quick reference (cont.)