Skip to content

Commit

Permalink
Updates for 18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike committed Oct 23, 2024
1 parent 4920f23 commit b65da4b
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 23 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "odoo/src/enterprise"]
path = odoo/src/enterprise
url = https://github.com/ursais/enterprise.git
[submodule "odoo/odoo"]
path = odoo/odoo
url = https://github.com/ursais/odoo.git
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "2"
services:
db:
image: ursa/postgresql:latest
image: postgres:17
restart: always
environment:
- POSTGRES_DB=postgres
Expand Down
4 changes: 2 additions & 2 deletions odoo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM public.ecr.aws/t4c3a5h0/odoo-base:18.0-test-20241010
FROM public.ecr.aws/t4c3a5h0/odoo-base:18.0-test-20241022
MAINTAINER Open Source Integrators <[email protected]>

# Copy files
Expand All @@ -12,4 +12,4 @@ COPY --chown=odoo songs /odoo/songs
# COPY --chown=odoo src/l10n-mexico /odoo/addons/
COPY src/enterprise /odoo/addons/

RUN cd /odoo && pip3 install -r requirements.txt
RUN cd /odoo && pip3 install -r requirements.txt --break-system-packages
22 changes: 3 additions & 19 deletions odoo/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,14 @@ migration:
options:
install_command: odoo
install_args: --log-level=debug
backup:
command: '
export DATE=$(date +%Y%m%dT%H%M%S) && psql -c "CREATE DATABASE $DATE WITH
TEMPLATE $PGDATABASE;"'
stop_on_failure: true
ignore_if: test "${RUNNING_ENV}" != "production"

versions:
- version: setup
backup: false
operations:
# pre:
# - psql -c "CREATE EXTENSION IF NOT EXISTS pg_trgm;"
post:
- anthem songs.setup.base::main
- /bin/sh -c "VERSION=17.0.1.0.0 anthem songs.environment::main"
- /bin/sh -c "VERSION=18.0.1.0.0 anthem songs.environment::main"
addons:
upgrade:
- customer
# - monitoring_status
- web_environment_ribbon
# modes:
# external:
# operations:
# addons:
# upgrade:
# - session_redis
- contacts

1 change: 1 addition & 0 deletions odoo/odoo
Submodule odoo added at d82522
2 changes: 1 addition & 1 deletion odoo/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

setup(
name="odoo-songs",
version="17.0.1.0.0",
version="18.0.1.0.0",
description="Odoo ERP",
license="GNU Affero General Public License v3 or later (AGPLv3+)",
author="Open Source Integrators",
Expand Down
1 change: 1 addition & 0 deletions odoo/src/enterprise
Submodule enterprise added at c2281f

0 comments on commit b65da4b

Please sign in to comment.