Browse Source

modified odoo.conf & build.sh & docker-compose files

Lou 2 years ago
parent
commit
806640ccce
5 changed files with 23 additions and 15 deletions
  1. 1
    0
      .gitignore
  2. 2
    1
      Dockerfile
  3. 1
    1
      build.sh
  4. 11
    9
      docker-compose.yml
  5. 8
    4
      odoo.conf

+ 1
- 0
.gitignore View File

@@ -0,0 +1 @@
1
+.env

+ 2
- 1
Dockerfile View File

@@ -94,10 +94,11 @@ RUN set -x; \
94 94
         find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\
95 95
         chown -R odoo:odoo /opt/odoo
96 96
 
97
-# Copy entrypoint script and Odoo configuration file
97
+# Copy entrypoint script and Odoo configuration file & create log file
98 98
 COPY ./entrypoint.sh /
99 99
 COPY ./odoo.conf /opt/odoo/etc/odoo.conf
100 100
 RUN chown odoo:odoo /opt/odoo/etc/odoo.conf
101
+RUN touch /var/log/odoo-exec.log && chown odoo:odoo /var/log/odoo-exec.log
101 102
 
102 103
 # Mount /opt/odoo/data to allow restoring filestore
103 104
 VOLUME ["/opt/odoo/data/"]

+ 1
- 1
build.sh View File

@@ -1,4 +1,4 @@
1 1
 #!/bin/sh
2 2
 docker build -t odoo-susan .
3
-docker-compose exec odoo python3 /opt/odoo/odoo/odoo-bin -c /opt/odoo/etc/odoo.conf --db_host db --db_port 5432 --db_user odoo --db_password leMotDePasse --init base --stop-after-init --no-http --without-demo=all
3
+docker-compose exec odoo python3 /opt/odoo/odoo/odoo-bin -c /opt/odoo/etc/odoo.conf -i base --stop-after-init --no-http --without-demo=all
4 4
 docker-compose --verbose up -d odoo

+ 11
- 9
docker-compose.yml View File

@@ -1,26 +1,28 @@
1
-version: "2.1"
1
+version: "3"
2 2
 services:
3 3
     odoo:
4
-        image: odoo-susan
4
+        build: .
5 5
         depends_on:
6 6
             - db
7 7
         tty: true
8 8
         ports:
9
-            - 8012:8069
9
+            - "${ODOO_PORT}:8069"
10 10
         volumes:
11 11
             - filestore:/opt/odoo/data:z
12 12
             - ./odoo.conf:/etc/odoo
13
+            - /var/log/odoo-docker-exec.log:/var/log/odoo-exec.log
13 14
         restart: unless-stopped
14
-        command:
15
-            - odoo
15
+        entrypoint: "opt/odoo/odoo/odoo-bin -c /opt/odoo/etc/odoo.conf -i base"
16 16
 
17 17
     db:
18 18
         image: postgres:13-alpine
19 19
         environment:
20
-            POSTGRES_DB: "odoo"
21
-            POSTGRES_USER: "odoo"
22
-            POSTGRES_PASSWORD: "9fbacb5390fa08b1cea5c141498134021bead7ada7aa1731e6fdd3eae60af92b"
23
-        volumes:
20
+            POSTGRES_DB: "${DB_NAME}"
21
+            POSTGRES_USER: "${DB_USER}"
22
+            POSTGRES_PASSWORD: "${DB_PASSWORD}"
23
+        ports:
24
+			- "${DB_PORT}:5432"
25
+		volumes:
24 26
             - db:/var/lib/postgresql/data:z
25 27
         restart: unless-stopped
26 28
 

+ 8
- 4
odoo.conf View File

@@ -5,6 +5,10 @@ data_dir = /opt/odoo/data
5 5
 ; csv_internal_sep = ,
6 6
 ; db_maxconn = 64
7 7
 db_name = odoo
8
+db_host = db
9
+db_user = odoo
10
+db_password = odoo_db_pwd
11
+db_port = 5432
8 12
 ; db_template = template1
9 13
 ; dbfilter = .*
10 14
 ; debug_mode = False
@@ -15,10 +19,10 @@ db_name = odoo
15 19
 ; limit_time_cpu = 60
16 20
 ; limit_time_real = 120
17 21
 ; list_db = True
18
-; log_db = False
19
-; log_handler = [':INFO']
20
-; log_level = info
21
-; logfile = None
22
+log_db = True
23
+log_handler = [':INFO']
24
+log_level = info
25
+logfile = /var/log/odoo-exec.log
22 26
 ; longpolling_port = 8072
23 27
 ; max_cron_threads = 2
24 28
 ; osv_memory_age_limit = 1.0

Loading…
Cancel
Save