From cccf978a331a7de1ee3149d30f532fb7f43a3c69 Mon Sep 17 00:00:00 2001 From: Alexander Bigga Date: Thu, 15 Feb 2024 16:05:49 +0100 Subject: [PATCH] Mailhog -> Mailpit, add openupgradelib, update readme --- 15.0/Dockerfile | 3 ++- 15.0/README.md | 23 ++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/15.0/Dockerfile b/15.0/Dockerfile index 59db05a..c4ee224 100644 --- a/15.0/Dockerfile +++ b/15.0/Dockerfile @@ -34,7 +34,8 @@ RUN apt-get update && \ && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.buster_amd64.deb \ && echo 'ea8277df4297afc507c61122f3c349af142f31e5 wkhtmltox.deb' | sha1sum -c - \ && apt-get install -y --no-install-recommends ./wkhtmltox.deb \ - && rm -rf /var/lib/apt/lists/* wkhtmltox.deb + && rm -rf /var/lib/apt/lists/* wkhtmltox.deb \ + && pip install openupgradelib # install latest postgresql-client RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ diff --git a/15.0/README.md b/15.0/README.md index 5cb5a8d..edc133a 100644 --- a/15.0/README.md +++ b/15.0/README.md @@ -32,24 +32,27 @@ services: ports: - 8269:8069 command: -- --dev=all + environment: + - OPENUPGRADE_TARGET_VERSION=15.0 volumes: - odoo15-data-live:/var/lib/odoo - ./config:/etc/odoo - ./addons:/mnt/extra-addons db: container_name: odoo15-db-live-1 - image: postgres:13 + image: postgres:15 environment: - POSTGRES_DB=postgres - POSTGRES_PASSWORD=odoo - POSTGRES_USER=odoo volumes: - odoo15-db-data-live:/var/lib/postgresql/data - mailhog: - image: mailhog/mailhog + - ./import-db:/tmp/import-db + mailpit: + image: axllent/mailpit ports: - 1225:1025 # smtp server - - 8227:8025 # web ui + - 8225:8025 # web ui adminer: image: adminer #restart: always @@ -66,7 +69,13 @@ Ports for the web access can be configured in the docker-compose file. ### Odoo -http://localhost:8269/ +#### Login + +http://localhost:8269/web/login + +#### Database-Manager + +http://localhost:8269/web/database/manager ### Adminer (PostgreSQL) @@ -78,6 +87,6 @@ http://localhost:8282/ * Password: odoo * Database: empty -### Mailhog +### Mailpit -http://localhost:8227/ +http://localhost:8225/