Docker Library Bot před 9 roky
rodič
revize
e0c0d9664f
5 změnil soubory, kde provedl 91 přidání a 6 odebrání
  1. 1 1
      arangodb/README.md
  2. 2 2
      eggdrop/README.md
  3. 2 2
      nginx/README.md
  4. 85 0
      odoo/README.md
  5. 1 1
      websphere-liberty/README.md

+ 1 - 1
arangodb/README.md

@@ -3,8 +3,8 @@
 -	[`2.5.5`, `2.5` (*jessie/2.5.5/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/636cd874df38edd77a187c08e1803693b3d978d3/jessie/2.5.5/Dockerfile)
 -	[`2.7`, `2.7.5` (*jessie/2.7.5/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/dbfcc5f3edb37f622a2acd221b58106547b05fae/jessie/2.7.5/Dockerfile)
 -	[`2.8`, `2.8.11` (*jessie/2.8.11/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/05366cb4c6a6aab8e1ff9ca74c81b09d9a57b5b5/jessie/2.8.11/Dockerfile)
--	[`3.0`, `3.0.10` (*jessie/3.0.10/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/b71073b2e36acff7d0660b7f73e659f16facbf99/jessie/3.0.10/Dockerfile)
 -	[`3.1`, `3.1.1`, `latest` (*jessie/3.1.1/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/66d3eccbb2bbe85c190658d4863652c26089d1b7/jessie/3.1.1/Dockerfile)
+-	[`3.0`, `3.0.12` (*jessie/3.0.12/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/baaf2cdbbecf43b184ab45009ea01620760199b3/jessie/3.0.12/Dockerfile)
 
 For more information about this image and its history, please see [the relevant manifest file (`library/arangodb`)](https://github.com/docker-library/official-images/blob/master/library/arangodb). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Farangodb).
 

+ 2 - 2
eggdrop/README.md

@@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links
 
--	[`develop` (*1.8/Dockerfile*)](https://github.com/eggheads/eggdrop-docker/blob/4b72c46a47b76d03922c36ba5db831002854286b/1.8/Dockerfile)
--	[`1.8`, `1.8.0`, `1.8.0rc3` (*1.8rc3/Dockerfile*)](https://github.com/eggheads/eggdrop-docker/blob/35d52300030d980db8be170f6e316f41a871ff7e/1.8rc3/Dockerfile)
+-	[`develop` (*1.8/Dockerfile*)](https://github.com/eggheads/eggdrop-docker/blob/9f3828141fbd3c6584cac8d89afb5ebb9bcea603/1.8/Dockerfile)
+-	[`1.8`, `1.8.0`, `1.8.0rc4` (*1.8rc4/Dockerfile*)](https://github.com/eggheads/eggdrop-docker/blob/9f3828141fbd3c6584cac8d89afb5ebb9bcea603/1.8rc4/Dockerfile)
 -	[`1.6`, `1.6.21`, `stable`, `latest` (*1.6/Dockerfile*)](https://github.com/eggheads/eggdrop-docker/blob/87d717b0c05d4c43460a411c9871e9190c94f8bb/1.6/Dockerfile)
 
 For more information about this image and its history, please see [the relevant manifest file (`library/eggdrop`)](https://github.com/docker-library/official-images/blob/master/library/eggdrop). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Feggdrop).

+ 2 - 2
nginx/README.md

@@ -1,7 +1,7 @@
 # Supported tags and respective `Dockerfile` links
 
--	[`1.11.5`, `mainline`, `1`, `1.11`, `latest` (*mainline/jessie/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/8921999083def7ba43a06fabd5f80e4406651353/mainline/jessie/Dockerfile)
--	[`1.11.5-alpine`, `mainline-alpine`, `1-alpine`, `1.11-alpine`, `alpine` (*mainline/alpine/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/8921999083def7ba43a06fabd5f80e4406651353/mainline/alpine/Dockerfile)
+-	[`1.11.6`, `mainline`, `1`, `1.11`, `latest` (*mainline/jessie/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/de8822d8d91ff0802989bc0a12f8ab55596a513c/mainline/jessie/Dockerfile)
+-	[`1.11.6-alpine`, `mainline-alpine`, `1-alpine`, `1.11-alpine`, `alpine` (*mainline/alpine/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/de8822d8d91ff0802989bc0a12f8ab55596a513c/mainline/alpine/Dockerfile)
 -	[`1.10.2`, `stable`, `1.10` (*stable/jessie/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/25a3fc7343c6916fce1fba32caa1e8de8409d79f/stable/jessie/Dockerfile)
 -	[`1.10.2-alpine`, `stable-alpine`, `1.10-alpine` (*stable/alpine/Dockerfile*)](https://github.com/nginxinc/docker-nginx/blob/25a3fc7343c6916fce1fba32caa1e8de8409d79f/stable/alpine/Dockerfile)
 

+ 85 - 0
odoo/README.md

@@ -80,6 +80,91 @@ $ docker run -p 8071:8069 --name odoo3 --link db:db -t odoo
 
 Please note that for plain use of mails and reports functionalities, when the host and container ports differ (e.g. 8070 and 8069), one has to set, in Odoo, Settings->Parameters->System Parameters (requires technical features), web.base.url to the container port (e.g. 127.0.0.1:8069).
 
+## Environment Variables
+
+Tweak these environment variables to easily connect to a postgres server:
+
+-	`HOST`: The address of the postgres server. If you used a postgres container, set to the name of the container. Defaults to `db`.
+-	`PORT`: The port the postgres server is listening to. Defaults to `5432`.
+-	`USER`: The postgres role with which Odoo will connect. If you used a postgres container, set to the same value as `POSTGRES_USER`. Defaults to `odoo`.
+-	`PASSWORD`: The password of the postgres role with which Odoo will connect. If you used a postgres container, set to the same value as `POSTGRES_PASSWORD`. Defaults to `odoo`.
+
+## Docker Compose examples
+
+The simplest `docker-compose.yml` file would be:
+
+```yml
+version: '2'
+services:
+  web:
+    image: odoo:10.0
+    depends_on:
+      - db
+    ports:
+      - "8069:8069"
+  db:
+    image: postgres:9.4
+    environment:
+      - POSTGRES_PASSWORD=odoo
+      - POSTGRES_USER=odoo
+```
+
+If the default postgres credentials does not suit you, tweak the environment variables:
+
+```yml
+version: '2'
+services:
+  web:
+    image: odoo:10.0
+    depends_on:
+      - mydb
+    ports:
+      - "8069:8069"
+    environment:
+    - HOST=mydb
+    - USER=odoo
+    - PASSWORD=myodoo
+  mydb:
+    image: postgres:9.4
+    environment:
+      - POSTGRES_USER=odoo
+      - POSTGRES_PASSWORD=myodoo
+```
+
+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:
+
+```yml
+version: '2'
+services:
+  web:
+    image: odoo:10.0
+    depends_on:
+      - db
+    ports:
+      - "8069:8069"
+    volumes:
+      - odoo-web-data:/var/lib/odoo
+      - ./config:/etc/odoo
+      - ./addons:/mnt/extra-addons
+  db:
+    image: postgres:9.4
+    environment:
+      - POSTGRES_PASSWORD=odoo
+      - POSTGRES_USER=odoo
+      - PGDATA=/var/lib/postgresql/data/pgdata
+    volumes:
+      - odoo-db-data:/var/lib/postgresql/data/pgdata
+volumes:
+  odoo-web-data:
+  odoo-db-data:
+```
+
+To start your Odoo instance, go in the directory of the `docker-compose.yml` file you created from the previous examples and type:
+
+```console
+docker-compose up -d
+```
+
 # How to upgrade this image
 
 Odoo images are updated on a regular basis to make them use recent releases (a new release of each version of Odoo is built [every night](http://nightly.odoo.com/)). Please be aware that what follows is about upgrading from an old release to the latest one provided of the same major version, as upgrading from a major version to another is a much more complex process requiring elaborated migration scripts (see [Odoo Enterprise Upgrade page](https://upgrade.odoo.com/database/upload) or this [community project](https://doc.therp.nl/openupgrade/) which aims to write those scripts).

+ 1 - 1
websphere-liberty/README.md

@@ -5,7 +5,7 @@
 -	[`webProfile6` (*ga/developer/webProfile6/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/78139a90b89d1b64502778fe63f9b4f4a93257b4/ga/developer/webProfile6/Dockerfile)
 -	[`webProfile7` (*ga/developer/webProfile7/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/78139a90b89d1b64502778fe63f9b4f4a93257b4/ga/developer/webProfile7/Dockerfile)
 -	[`javaee7`, `latest` (*ga/developer/javaee7/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/78139a90b89d1b64502778fe63f9b4f4a93257b4/ga/developer/javaee7/Dockerfile)
--	[`beta` (*beta/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/a0c6b0a671dedf839d9f3f2a8d8156c7240b58ee/beta/Dockerfile)
+-	[`beta` (*beta/Dockerfile*)](https://github.com/WASdev/ci.docker/blob/c63e151757a992fd5eb9da11d8bbf9501468b39b/beta/Dockerfile)
 
 For more information about this image and its history, please see [the relevant manifest file (`library/websphere-liberty`)](https://github.com/docker-library/official-images/blob/master/library/websphere-liberty). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2Fwebsphere-liberty).