diff --git a/docker-compose.yml b/docker-compose.yml index 1492b13..2ca1ab6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,43 +1,43 @@ version: "3.3" services: - ERPLibre: - image: technolibre/erplibre:1.2.1 - ports: - - 8069:8069 - - 8071:8071 - - 8072:8072 - environment: - HOST: db - PASSWORD: mysecretpassword - USER: odoo - POSTGRES_DB: postgres - STOP_BEFORE_INIT: "False" - DB_NAME: "" - UPDATE_ALL_DB: "False" - depends_on: - - db - # not behind a proxy - #command: odoo --workers 0 - # behind a proxy - #command: odoo --workers 2 - command: odoo - volumes: - # See the volume section at the end of the file - - erplibre_data_dir:/home/odoo/.local/share/Odoo - - ./addons/addons:/ERPLibre/addons/addons - - erplibre_conf:/etc/odoo - restart: always + ERPLibre: + image: technolibre/erplibre:1.2.1 + ports: + - 8069:8069 + - 8071:8071 + - 8072:8072 + environment: + HOST: db + PASSWORD: mysecretpassword + USER: odoo + POSTGRES_DB: postgres + STOP_BEFORE_INIT: "False" + DB_NAME: "" + UPDATE_ALL_DB: "False" + depends_on: + - db + # not behind a proxy + #command: odoo --workers 0 + # behind a proxy + #command: odoo --workers 2 + command: odoo + volumes: + # See the volume section at the end of the file + - erplibre_data_dir:/home/odoo/.local/share/Odoo + - ./addons/addons:/ERPLibre/addons/addons + - erplibre_conf:/etc/odoo + restart: always - db: - image: postgis/postgis:12-3.1-alpine - environment: - POSTGRES_PASSWORD: mysecretpassword - POSTGRES_USER: odoo - POSTGRES_DB: postgres - PGDATA: /var/lib/postgresql/data/pgdata - volumes: - - erplibre-db-data:/var/lib/postgresql/data/pgdata - restart: always + db: + image: postgis/postgis:12-3.1-alpine + environment: + POSTGRES_PASSWORD: mysecretpassword + POSTGRES_USER: odoo + POSTGRES_DB: postgres + PGDATA: /var/lib/postgresql/data/pgdata + volumes: + - erplibre-db-data:/var/lib/postgresql/data/pgdata + restart: always # We configure volume without specific destination to let docker manage it. To configure it through docker use (read related documentation before continuing) : # - docker volume --help diff --git a/docker/Dockerfile.prod.pkg b/docker/Dockerfile.prod.pkg index e7d7e82..6bb2028 100644 --- a/docker/Dockerfile.prod.pkg +++ b/docker/Dockerfile.prod.pkg @@ -34,7 +34,6 @@ RUN cd $ODOO_PREFIX && \ RUN cd $ODOO_PREFIX && \ ./script/update_manifest_dev.sh -# TODO delete poetry installation # Install Poetry RUN cd $ODOO_PREFIX && \ curl -sSL -o get-poetry.py https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py && \ @@ -43,7 +42,8 @@ RUN cd $ODOO_PREFIX && \ RUN cd $ODOO_PREFIX && \ ./.venv/bin/pip install --upgrade pip && \ ./.venv/bin/python ~/.poetry/bin/poetry install && \ - rm -rf artifacts + rm -rf artifacts && \ + rm -rf ~/.poetry RUN cd $ODOO_PREFIX/.venv && \ curl https://raw.githubusercontent.com/ERPLibre/multilingual-markdown/master/multilang_md.py > ./multilang_md.py && \ diff --git a/docker/README.md b/docker/README.md index 8b78e64..a0f63e0 100644 --- a/docker/README.md +++ b/docker/README.md @@ -121,3 +121,7 @@ List your docker version You need to push your docker image and update your tag, like 1.0.1: > docker push technolibre/erplibre:VERSION + +# Diagnostic +When getting and error about missing module, or after an upgrade, you need to update config file. +> make docker_exec_erplibre_gen_config