Skip to content

Commit

Permalink
Merge branch '7.0.1.1' of github.com:seb-elico/odoo-docker into 10.0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
seb-elico committed Oct 20, 2017
2 parents 13686de + a773b22 commit d5453b2
Show file tree
Hide file tree
Showing 2 changed files with 231 additions and 186 deletions.
12 changes: 0 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ more information about Compose, see the [official documentation][dc-doc].
image: postgres:9.5
environment:
- POSTGRES_USER=odoo
network_mode: bridge

odoo:
image: elicocorp/odoo:10.0
Expand All @@ -93,7 +92,6 @@ more information about Compose, see the [official documentation][dc-doc].
- postgres:db
environment:
- ODOO_DB_USER=odoo
network_mode: bridge

Once this file is created, simply move to the corresponding folder and run the
following command to start Odoo:
Expand Down Expand Up @@ -150,7 +148,6 @@ The `docker-compose.yml` should look like:
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=strong_pg_superuser_password
network_mode: bridge

odoo:
image: elicocorp/odoo:10.0
Expand All @@ -163,7 +160,6 @@ The `docker-compose.yml` should look like:
- ODOO_ADMIN_PASSWD=strong_odoo_master_password
- ODOO_DB_USER=odoo
- ODOO_DB_PASSWORD=strong_pg_odoo_password
network_mode: bridge

**Note:** If Odoo is behind a reverse proxy, it is also suggested to change the
port published by the container (though this port is actually not opened to the
Expand Down Expand Up @@ -205,7 +201,6 @@ The `docker-compose.yml` should look like:
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=strong_pg_superuser_password
network_mode: bridge

odoo:
image: elicocorp/odoo:10.0
Expand All @@ -221,7 +216,6 @@ The `docker-compose.yml` should look like:
- ODOO_ADMIN_PASSWD=strong_odoo_master_password
- ODOO_DB_USER=odoo
- ODOO_DB_PASSWORD=strong_pg_odoo_password
network_mode: bridge

**Note:** With this configuration, all the data created in the volumes will
belong to the user whose UID matches the user running inside the container.
Expand Down Expand Up @@ -341,7 +335,6 @@ The `docker-compose.yml` should look like:
- POSTGRES_PASSWORD=strong_pg_superuser_password
- /etc/passwd:/etc/passwd:ro
user: 1001:1001
network_mode: bridge

odoo:
image: elicocorp/odoo:10.0
Expand All @@ -358,7 +351,6 @@ The `docker-compose.yml` should look like:
- ODOO_ADMIN_PASSWD=strong_odoo_master_password
- ODOO_DB_USER=odoo
- ODOO_DB_PASSWORD=strong_pg_odoo_password
network_mode: bridge

**Note:** For a more dynamic UID mapping, you can use Compose
[variable substitution][dk-var]. Simply export the environment variable `UID`
Expand Down Expand Up @@ -458,7 +450,6 @@ as well as all the Git repositories it depends on, you can use the following
- POSTGRES_PASSWORD=strong_pg_superuser_password
- /etc/passwd:/etc/passwd:ro
user: 1001:1001
network_mode: bridge

odoo:
image: elicocorp/odoo:10.0
Expand All @@ -477,7 +468,6 @@ as well as all the Git repositories it depends on, you can use the following
- ODOO_ADMIN_PASSWD=strong_odoo_master_password
- ODOO_DB_USER=odoo
- ODOO_DB_PASSWORD=strong_pg_odoo_password
network_mode: bridge

**Note:** After the repositories have been fetched, it might not be required to
pull them every time the container is restarted. In that case, simply set the
Expand Down Expand Up @@ -532,7 +522,6 @@ The `docker-compose.yml` should look like:
- POSTGRES_PASSWORD=strong_pg_superuser_password
- /etc/passwd:/etc/passwd:ro
user: 1001:1001
network_mode: bridge

odoo:
image: elicocorp/odoo:10.0
Expand All @@ -552,7 +541,6 @@ The `docker-compose.yml` should look like:
- ODOO_ADMIN_PASSWD=strong_odoo_master_password
- ODOO_DB_USER=odoo
- ODOO_DB_PASSWORD=strong_pg_odoo_password
network_mode: bridge

**Note:** If the host user has a valid SSH key under the `.ssh` folder of his
home folder, he can map his `.ssh` folder instead, e.g.:
Expand Down
Loading

0 comments on commit d5453b2

Please sign in to comment.