Browse Source

[UPD] last v14 version

14.0
Nicolas JEUDY 1 year ago
parent
commit
6ad8f7c8a8
  1. 6
      CloudronManifest.json
  2. 6
      Dockerfile
  3. 17
      custom/dependencies/pip.txt
  4. 4
      custom/src/addons.yaml
  5. 17
      custom/src/repos.yaml
  6. 11
      start.sh

6
CloudronManifest.json

@ -6,7 +6,7 @@
"title": "Odoo",
"author": "Odoo authors",
"tagline": "Open Source ERP and CRM",
"version": "15.0.0",
"version": "14.0.0",
"icon": "manifest/logo.png",
"description": "file://manifest/DESCRIPTION.md",
"changelog": "file://manifest/CHANGELOG.md",
@ -25,8 +25,8 @@
"auth"
],
"optionalSso": true,
"multiDomain": true,
"mediaLinks": [],
"forumUrl": "https://forum.cloudron.io/",
"documentationUrl": "https://docs.cloudron.io/"
}
}

6
Dockerfile

@ -38,6 +38,10 @@ RUN git config --global user.name "Cloudron service"
# RUN curl -L https://github.com/odoo/odoo/archive/${ODOO_COMMIT_HASH}.tar.gz | tar zx --strip-components 1 -C /app/code && \
RUN git clone https://github.com/odoo/odoo.git --depth 1 -b $ODOO_VERSION /app/code/odoo
WORKDIR /app/code/odoo
RUN git pull -r
WORKDIR /app/code
RUN pip3 install -e /app/code/odoo
RUN pip3 install wheel && \
pip3 install -r https://raw.githubusercontent.com/$ODOO_SOURCE/$ODOO_VERSION/requirements.txt && \
pip3 install psycopg2==2.8.6 \
@ -45,7 +49,7 @@ RUN pip3 install wheel && \
&& (python3 -m compileall -q /usr/local/lib/python3.8/ || true)
# Patch Odoo to prevent connecting to the default database named 'postgres' every now and then.
RUN sed -i.bak "718i\ to = tools.config['db_name']" /app/code/odoo/odoo/sql_db.py
RUN sed -i.bak "720i\ to = tools.config['db_name']" /app/code/odoo/odoo/sql_db.py
# Properly map the LDAP attribute 'displayname' instead of 'cn' to the display name of the logged in user.
RUN sed -i.bak "181s/'cn'/'displayname'/" /app/code/odoo/addons/auth_ldap/models/res_company_ldap.py

17
custom/dependencies/pip.txt

@ -22,7 +22,7 @@ viberbot
PyMuPDF==1.16.14
factur-x
regex
dateparser
dateparser==1.1.1
pycairo
rocketchat_API
ovh
@ -41,4 +41,17 @@ pysaml2
odoo_test_helper
python-jose
click-odoo-contrib
python-jose
python-jose
pdfplumber
openpyxl
PyGithub
caldav
python-stdnum==1.17
vatnumber
pydrive
weboob
dropbox
pysftp
icalendar
jsondiff
extendable-pydantic

4
custom/src/addons.yaml

@ -162,3 +162,7 @@ odoo-usability:
- "*"
odoo-py3o-report-templates:
- "*"
project-tools:
- "*"
pad-tools:
- "*"

17
custom/src/repos.yaml

@ -603,7 +603,6 @@
- oca 14.0
- oca refs/pull/326/head
#- oca refs/pull/334/head
- oca refs/pull/454/head
./timesheet:
defaults:
# Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner
@ -882,3 +881,19 @@
target: origin 14.0
merges:
- origin 14.0
./project-tools:
defaults:
depth: $DEPTH_DEFAULT
remotes:
origin: https://github.com/elabore-coop/project-tools.git
target: origin 14.0
merges:
- origin 14.0
./pad-tools:
defaults:
depth: $DEPTH_DEFAULT
remotes:
origin: https://github.com/elabore-coop/pad-tools.git
target: origin 14.0
merges:
- origin 14.0

11
start.sh

@ -42,13 +42,18 @@ if [[ ! -f /app/data/odoo.conf ]]; then
echo "First run complete."
fi
/usr/local/bin/gosu cloudron:cloudron /app/code/odoo/odoo-bin -i auth_ldap -c /app/data/odoo.conf --without-demo all -d $CLOUDRON_POSTGRESQL_DATABASE --stop-after-init
# These values should be re-set to make Odoo work as expcected.
echo "Ensuring proper [options] in /app/data/odoo.conf ..."
/usr/local/bin/gosu cloudron:cloudron /app/code/odoo/odoo-bin -i auth_ldap,fetchmail -d $CLOUDRON_POSTGRESQL_DATABASE -c /app/data/odoo.conf --without-demo all --stop-after-init
# Check if asking update
if [[ -f /app/data/update ]]; then
/usr/local/bin/gosu cloudron:cloudron /app/code/odoo/odoo-bin -u all -d $CLOUDRON_POSTGRESQL_DATABASE -c /app/data/odoo.conf --without-demo all --stop-after-init
fi
# Custom paths
crudini --set /app/data/odoo.conf 'options' addons_path "/app/code/auto/addons,/app/data/extra-addons,/app/code/odoo/addons"
crudini --set /app/data/odoo.conf 'options' addons_path "/app/data/extra-addons,/app/code/auto/addons,/app/code/odoo/addons"
crudini --set /app/data/odoo.conf 'options' data_dir "/app/data/odoo"
# Logging

Loading…
Cancel
Save