Skip to content

Commit 0c38f66

Browse files
[FIX] *: Multiple changes for corner cases
1 parent 0116110 commit 0c38f66

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ ENV NODE_VERSION ${NODE_VERSION:-8}
1515
# Odoo Configuration file defaults
1616
ENV \
1717
DATA_DIR=${DATA_DIR:-/var/lib/odoo/data} \
18-
DB_PORT_5432_TCP_ADDR=${DB_PORT_5432_TCP_ADDR:-False} \
18+
DB_PORT_5432_TCP_ADDR=${DB_PORT_5432_TCP_ADDR:-db} \
1919
DB_MAXCONN=${DB_MAXCONN:-64} \
20-
DB_ENV_POSTGRES_PASSWORD=${DB_ENV_POSTGRES_PASSWORD:-False} \
20+
DB_ENV_POSTGRES_PASSWORD=${DB_ENV_POSTGRES_PASSWORD:-odoo} \
2121
DB_PORT_5432_TCP_PORT=${DB_PORT_5432_TCP_PORT:-5432} \
2222
DB_SSLMODE=${DB_SSLMODE:-prefer} \
2323
DB_TEMPLATE=${DB_TEMPLATE:-template1} \
24-
DB_ENV_POSTGRES_USER=${DB_ENV_POSTGRES_USER:-False} \
24+
DB_ENV_POSTGRES_USER=${DB_ENV_POSTGRES_USER:-odoo} \
2525
DBFILTER=${DBFILTER:-.*} \
26-
HTTP_INTERFACE=${HTTP_INTERFACE:-127.0.0.1} \
26+
HTTP_INTERFACE=${HTTP_INTERFACE:-0.0.0.0} \
2727
HTTP_PORT=${HTTP_PORT:-8069} \
2828
LIMIT_MEMORY_HARD=${LIMIT_MEMORY_HARD:-2684354560} \
2929
LIMIT_MEMORY_SOFT=${LIMIT_MEMORY_SOFT:-2147483648} \
@@ -34,7 +34,7 @@ ENV \
3434
LOG_DB=${LOG_DB:-False} \
3535
LOG_DB_LEVEL=${LOG_DB_LEVEL:-warning} \
3636
LOG_HANDLER=${LOG_HANDLER:-:INFO} \
37-
LOG_LEVEL=${LOG_LEVEL:-debug} \
37+
LOG_LEVEL=${LOG_LEVEL:-info} \
3838
MAX_CRON_THREADS=${MAX_CRON_THREADS:-2} \
3939
PROXY_MODE=${PROXY_MODE:-False} \
4040
SERVER_WIDE_MODULES=${SERVER_WIDE_MODULES:-base,web} \
@@ -44,7 +44,7 @@ ENV \
4444
SMTP_SSL=${SMTP_SSL:-False} \
4545
SMTP_USER=${SMTP_USER:-False} \
4646
TEST_ENABLE=${TEST_ENABLE:-False} \
47-
UNACCENT=${UNACCENT:-True} \
47+
UNACCENT=${UNACCENT:-False} \
4848
WITHOUT_DEMO=${WITHOUT_DEMO:-False} \
4949
WORKERS=${WORKERS:-0}
5050

docker-compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,16 @@ services:
4040

4141
networks:
4242
odoonet:
43-
# ------------------------
43+
# ------------------------
4444
db:
4545
image: postgres:${PSQL_VERSION:-11}
4646
volumes:
47-
- psql:/var/lib/postgresql/data
47+
- psql:/var/lib/postgresql/data/pgdata
4848
environment:
49+
- POSTGRES_DB=postgres
4950
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-odoo}
5051
- POSTGRES_USER=${POSTGRES_USER:-odoo}
52+
- PGDATA=/var/lib/postgresql/data/pgdata
5153

5254
networks:
5355
odoonet:

resources/entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#!/bin/bash -x
1+
#!/bin/bash
22

3-
set -e
3+
set -xe
44

55
# set the postgres database host, port, user and password according to the environment
66
# and pass them as arguments to the odoo process if not present in the config file

0 commit comments

Comments
 (0)