Skip to content

Commit

Permalink
Run update.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
docker-library-bot committed Oct 9, 2018
1 parent a691fe1 commit 3177c6d
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 18 deletions.
4 changes: 2 additions & 2 deletions centos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ WARNING:

# Supported tags and respective `Dockerfile` links

- [`latest`, `centos7`, `7` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/24c0d04946b72e37776309224712b5f05aa52639/docker/Dockerfile)
- [`centos6`, `6` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/0006cfe4f77792978469d47672763d6961afe4be/docker/Dockerfile)
- [`latest`, `centos7`, `7` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/72c01dc74ef482ce318167c5c10646be65ac682e/docker/Dockerfile)
- [`centos6`, `6` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/23b05f6a35520ebf338e4df918e4952830da068b/docker/Dockerfile)
- [`centos7.5.1804`, `7.5.1804` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/0cea32a0018ac2d874960d9378a9745bf92affd2/docker/Dockerfile)
- [`centos7.4.1708`, `7.4.1708` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/66add29c188e42d4d855f4d4acdb2b73d547edb6/docker/Dockerfile)
- [`centos7.3.1611`, `7.3.1611` (*docker/Dockerfile*)](https://github.com/CentOS/sig-cloud-instance-images/blob/5bbaef9f60ab9e3eeb61acec631c2d91f8714fff/docker/Dockerfile)
Expand Down
2 changes: 1 addition & 1 deletion consul/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Consul is a distributed, highly-available, and multi-datacenter aware tool for s
- [Consul documentation](https://www.consul.io/)
- [Consul on GitHub](https://github.com/hashicorp/consul)

![logo](https://cdn.rawgit.com/docker-library/docs/8adb88e1e328c244711742f65319ed4064cff9a2/consul/logo.svg)
![logo](https://raw.githubusercontent.com/docker-library/docs/8adb88e1e328c244711742f65319ed4064cff9a2/consul/logo.svg?sanitize=true)

# Consul and Docker

Expand Down
2 changes: 1 addition & 1 deletion nextcloud/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ A safe home for all your data. Access & share your files, calendars, contacts, m

> [Nextcloud.com](https://nextcloud.com/)
![logo](https://cdn.rawgit.com/docker-library/docs/e563b6cd3d797e2b3695576d20041227d1fb7536/nextcloud/logo.svg)
![logo](https://raw.githubusercontent.com/docker-library/docs/e563b6cd3d797e2b3695576d20041227d1fb7536/nextcloud/logo.svg?sanitize=true)

# How to use this image

Expand Down
24 changes: 13 additions & 11 deletions odoo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ This image requires a running PostgreSQL server.
## Start a PostgreSQL server

```console
$ docker run -d -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo --name db postgres:9.4
$ docker run -d -e POSTGRES_USER=odoo -e POSTGRES_PASSWORD=odoo -e POSTGRES_DB=postgres --name db postgres:10
```

## Start an Odoo instance
Expand All @@ -89,13 +89,13 @@ Restarting a PostgreSQL server does not affect the created databases.

## Run Odoo with a custom configuration

The default configuration file for the server (located at `/etc/odoo/openerp-server.conf`) can be overriden at startup using volumes. Suppose you have a custom configuration at `/path/to/config/openerp-server.conf`, then
The default configuration file for the server (located at `/etc/odoo/odoo.conf`) can be overriden at startup using volumes. Suppose you have a custom configuration at `/path/to/config/odoo.conf`, then

```console
$ 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/8.0/openerp-server.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/12.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

Expand Down Expand Up @@ -137,16 +137,17 @@ The simplest `docker-compose.yml` file would be:
version: '2'
services:
web:
image: odoo:10.0
image: odoo:12.0
depends_on:
- db
ports:
- "8069:8069"
db:
image: postgres:9.4
image: postgres:10
environment:
- POSTGRES_PASSWORD=odoo
- POSTGRES_USER=odoo
- POSTGRES_DB=postgres
```
If the default postgres credentials does not suit you, tweak the environment variables:
Expand All @@ -155,7 +156,7 @@ If the default postgres credentials does not suit you, tweak the environment var
version: '2'
services:
web:
image: odoo:10.0
image: odoo:12.0
depends_on:
- mydb
ports:
Expand All @@ -165,10 +166,11 @@ services:
- USER=odoo
- PASSWORD=myodoo
mydb:
image: postgres:9.4
image: postgres:10
environment:
- POSTGRES_USER=odoo
- POSTGRES_PASSWORD=myodoo
- POSTGRES_DB=postgres
```
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:
Expand All @@ -177,7 +179,7 @@ Here's a last example showing you how to mount custom addons, how to use a custo
version: '2'
services:
web:
image: odoo:10.0
image: odoo:12.0
depends_on:
- db
ports:
Expand All @@ -187,7 +189,7 @@ services:
- ./config:/etc/odoo
- ./addons:/mnt/extra-addons
db:
image: postgres:9.4
image: postgres:10
environment:
- POSTGRES_PASSWORD=odoo
- POSTGRES_USER=odoo
Expand All @@ -211,7 +213,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 8.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 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

```console
$ docker run --volumes-from old-odoo -p 8070:8069 --name new-odoo --link db:db -t odoo
Expand All @@ -221,7 +223,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/8.0/LICENSE) for the software contained in this image.
View [license information](https://raw.githubusercontent.com/odoo/odoo/12.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).

Expand Down
2 changes: 1 addition & 1 deletion plone/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ WARNING:

[Plone](https://plone.org) is a free and open source content management system built on top of the Zope application server.

![logo](https://cdn.rawgit.com/docker-library/docs/888adfc80adb42b47fa6d446d472ec3f44274be8/plone/logo.svg)
![logo](https://raw.githubusercontent.com/docker-library/docs/888adfc80adb42b47fa6d446d472ec3f44274be8/plone/logo.svg?sanitize=true)

## Features

Expand Down
2 changes: 1 addition & 1 deletion rocket.chat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Rocket.Chat is a Web Chat Server, developed in JavaScript, using the Meteor full

It is a great solution for communities and companies wanting to privately host their own chat service or for developers looking forward to build and evolve their own chat platforms.

![logo](https://cdn.rawgit.com/docker-library/docs/03a593f2d33ac163b1b346a60de29aa59f7f78db/rocket.chat/logo.svg)
![logo](https://raw.githubusercontent.com/docker-library/docs/03a593f2d33ac163b1b346a60de29aa59f7f78db/rocket.chat/logo.svg?sanitize=true)

# How to use this image

Expand Down
2 changes: 1 addition & 1 deletion vault/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Vault is a tool for securely accessing secrets. A secret is anything that you wa
- [Vault documentation](https://www.vaultproject.io/)
- [Vault on GitHub](https://github.com/hashicorp/vault)

![logo](https://cdn.rawgit.com/docker-library/docs/fab4b16599d1424cee888d47af850e0ba07e6a37/vault/logo.svg)
![logo](https://raw.githubusercontent.com/docker-library/docs/fab4b16599d1424cee888d47af850e0ba07e6a37/vault/logo.svg?sanitize=true)

# Using the Container

Expand Down

0 comments on commit 3177c6d

Please sign in to comment.