Skip to content

Commit 055f945

Browse files
sebastienbeausebastienbeau
committed
Add image for 12 and update requirements
1 parent 13d1cb5 commit 055f945

File tree

7 files changed

+207
-75
lines changed

7 files changed

+207
-75
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
include:
16+
- ODOOVERSION: "12.0"
1617
- ODOOVERSION: "14.0"
1718
- ODOOVERSION: "16.0"
1819
steps:

‎12.0/Dockerfile‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
FROM ghcr.io/acsone/odoo-bedrock:12.0-py37-latest
2+
MAINTAINER Akretion
3+
4+
# syntax = docker/dockerfile:1.4
5+
6+
# List from https://github.com/camptocamp/docker-odoo-project/blob/master/12.0/Dockerfile
7+
ENV BUILD_PACKAGE \
8+
build-essential \
9+
gcc \
10+
python3.7-dev \
11+
libevent-dev \
12+
libfreetype6-dev \
13+
libxml2-dev \
14+
libxslt1-dev \
15+
libsasl2-dev \
16+
libldap2-dev \
17+
libssl-dev \
18+
libjpeg-dev \
19+
libpng-dev \
20+
zlib1g-dev \
21+
git \
22+
# Additionnal dep from Ak
23+
#vim \
24+
po4a \
25+
libpq-dev \
26+
postgresql-client \
27+
libmupdf-dev \
28+
mupdf-tools \
29+
mupdf \
30+
expect
31+
32+
# recreate isolate env
33+
RUN set -x \
34+
&& rm -rf /odoo/bin \
35+
&& python3.7 -m venv /env \
36+
&& /env/bin/pip install -U pip wheel setuptools
37+
ENV PATH=/env/bin:$PATH
38+
39+
RUN --mount=type=cache,target=/var/cache/apt \
40+
apt-get update \
41+
&& apt-get install -y --no-install-recommends $BUILD_PACKAGE
42+
43+
RUN pip install --force-reinstall pip "setuptools<58"
44+
45+
COPY 12.0/base_requirements.txt /tmp/base_requirements.txt
46+
RUN pip install --no-cache-dir -r /tmp/base_requirements.txt
47+
48+
COPY 12.0/ak_requirements.txt /tmp/ak_requirements.txt
49+
RUN pip install --no-cache-dir -r /tmp/ak_requirements.txt
50+
51+
ENV ADDONS_PATH=/odoo/src/addons,/odoo/local-src,/odoo/links
52+
53+
COPY install/* /install/
54+
RUN --mount=type=cache,target=/root/.cache /install/install_tool && rm /install/install_tool
55+
56+
COPY install/repos.yaml /root/.config/git-autoshare/repos.yml
57+
COPY bin/* /usr/local/bin/
58+
59+
60+
# customize entrypoint
61+
62+
ENTRYPOINT ["/usr/local/bin/ak-entrypoint.sh"]
63+
CMD ["odoo"]

‎12.0/ak_requirements.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
click-odoo-contrib>=1.16.0
2+
sentry_sdk>=1.9.9
3+
git+https://github.com/oca/openupgradelib.git@master
4+
odoo_test_helper==2.0.2

‎12.0/base_requirements.txt‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# Odoo dependencies
2+
# python_version = 3.7
3+
# sys_platform != 'win32'
4+
# this is a copy of Odoo dependencies with some bumped versions
5+
# unused official dependencies are commented to avoid dependabot alerts
6+
Babel==2.11.0
7+
chardet==5.0.0
8+
decorator==5.1.1
9+
docutils==0.19
10+
ebaysdk==2.2.0
11+
gevent==22.10.2
12+
greenlet==2.0.1
13+
html2text==2020.1.16
14+
Jinja2==2.11.3
15+
libsass==0.22.0
16+
lxml==4.9.1
17+
Mako==1.2.4
18+
MarkupSafe==1.1.1
19+
mock==4.0.3
20+
num2words==0.5.12
21+
ofxparse==0.21
22+
passlib==1.7.4
23+
Pillow==9.3.0
24+
psutil==5.9.4
25+
psycopg2==2.9.5
26+
pydot==1.4.2
27+
pyldap==3.0.0
28+
pyparsing==3.0.9
29+
PyPDF2==1.27.12
30+
pyserial==3.5
31+
python-dateutil==2.8.2
32+
pytz==2022.6
33+
pyusb==1.2.1
34+
qrcode==7.3.1
35+
reportlab==3.6.12
36+
requests==2.28.1
37+
suds-jurko==0.6
38+
vatnumber==1.2
39+
vobject==0.9.6.1
40+
Werkzeug==0.16.1
41+
XlsxWriter==3.0.3
42+
xlwt==1.3.*
43+
xlrd==2.0.1
44+
45+
# Not part of official requirements, but used by some addons
46+
chardet==5.0.0
47+
# colorama==0.3.9
48+
gdata==2.0.18
49+
html5lib==1.1
50+
odfpy==1.4.1
51+
pyinotify==0.9.6
52+
python-stdnum==1.18
53+
simplejson==3.18.0
54+
urllib3==1.26.11
55+
56+
# test / lint
57+
# those libs and their dependencies are unpinned
58+
# to always test with the last version of it
59+
flake8
60+
pytest
61+
pluggy
62+
coverage
63+
pytest-odoo
64+
pytest-cov
65+
watchdog
66+
67+
# Library dependency
68+
argh==0.26.2
69+
atomicwrites==1.4.1
70+
attrs==22.1.0
71+
beautifulsoup4==4.11.1
72+
future==0.18.2
73+
mccabe==0.7.0
74+
more-itertools==9.0.0
75+
pathtools==0.1.2
76+
pbr==5.11.0
77+
pexpect==4.8.0
78+
ptyprocess==0.7.0
79+
py==1.11.0
80+
pycodestyle==2.10.0
81+
pyflakes==3.0.1
82+
unicodecsv==0.14.1
83+
wrapt==1.14.1

‎14.0/base_requirements.txt‎

Lines changed: 52 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -3,74 +3,52 @@
33
# sys_platform != 'win32'
44
# this is a copy of Odoo dependencies with some bumped versions
55
# unused official dependencies are commented to avoid dependabot alerts
6-
Babel==2.6.0
7-
chardet==3.0.4
8-
decorator==4.3.0
9-
docutils==0.14
10-
ebaysdk==2.1.5
11-
freezegun==0.3.11; python_version < '3.8'
12-
# freezegun==0.3.15; python_version >= '3.8'
13-
# gevent==1.1.2 ; sys_platform != 'win32' and python_version < '3.7'
14-
gevent==1.5.0 ; python_version == '3.7'
15-
# gevent==20.9.0 ; python_version >= '3.8'
16-
# gevent==1.4.0 ; sys_platform == 'win32' and python_version < '3.7'
17-
# greenlet==0.4.10 ; python_version < '3.7'
18-
greenlet==0.4.15 ; python_version == '3.7'
19-
# greenlet==0.4.17 ; python_version > '3.7'
20-
html2text==2018.1.9
21-
idna==2.6
22-
Jinja2==2.11.3; python_version < '3.8' # official 2.10.1
23-
# bullseye version, focal patched 2.10
24-
# Jinja2==2.11.3; python_version >= '3.8' # official 2.11.2
25-
libsass==0.17.0
26-
# lxml==3.7.1 ; sys_platform != 'win32' and python_version < '3.7'
27-
lxml==4.6.3 ; sys_platform != 'win32' and python_version == '3.7' # official 4.3.2
28-
# lxml==4.6.3 ; sys_platform != 'win32' and python_version > '3.7' # official 4.6.1
29-
# lxml ; sys_platform == 'win32'
30-
Mako==1.0.7
31-
MarkupSafe==1.1.0
32-
num2words==0.5.6
33-
ofxparse==0.19
34-
passlib==1.7.1
35-
Pillow==8.3.2 ; python_version <= '3.7' and sys_platform != 'win32' # official 5.4.1
36-
# Pillow==6.1.0 ; python_version <= '3.7' and sys_platform == 'win32'
37-
# Pillow==8.3.2 ; python_version > '3.7' # official 8.1.1
38-
polib==1.1.0
39-
psutil==5.6.6
40-
psycopg2==2.7.7; sys_platform != 'win32' and python_version < '3.8'
41-
# psycopg2==2.8.6; sys_platform == 'win32' or python_version >= '3.8' # official 2.8.5
42-
pydot==1.4.1
43-
python-ldap==3.1.0; sys_platform != 'win32'
44-
PyPDF2==1.26.0
45-
pyserial==3.4
46-
python-dateutil==2.7.3
47-
pytz==2019.1
48-
pyusb==1.0.2
49-
qrcode==6.1
50-
reportlab==3.5.55; python_version >= '3.8'
51-
requests==2.25.1 # official 2.21.0
52-
zeep==3.2.0
53-
python-stdnum==1.13 # official 1.8
6+
Babel==2.11.0
7+
chardet==5.0.0
8+
decorator==5.1.1
9+
docutils==0.19
10+
ebaysdk==2.2.0
11+
freezegun==1.2.2
12+
gevent==22.10.2
13+
greenlet==2.0.1
14+
html2text==2020.1.16
15+
idna==3.4
16+
Jinja2==3.1.2
17+
libsass==0.22.0
18+
lxml==4.9.1
19+
Mako==1.2.4
20+
MarkupSafe==2.1.1
21+
num2words==0.5.12
22+
ofxparse==0.21
23+
passlib==1.7.4
24+
Pillow==9.3.0
25+
polib==1.1.1
26+
psutil==5.9.4
27+
psycopg2==2.9.5
28+
pydot==1.4.2
29+
python-ldap==3.4.3
30+
PyPDF2==1.27.12
31+
pyserial==3.5
32+
python-dateutil==2.8.2
33+
pytz==2022.6
34+
pyusb==1.2.1
35+
qrcode==7.3.1
36+
reportlab==3.6.12
37+
requests==2.28.1
38+
zeep==4.2.1
39+
python-stdnum==1.18
5440
vobject==0.9.6.1
5541
Werkzeug==0.16.1
56-
XlsxWriter==1.1.2
42+
XlsxWriter==3.0.3
5743
xlwt==1.3.*
58-
xlrd==1.1.0; python_version < '3.8'
59-
# xlrd==1.2.0; python_version >= '3.8'
60-
# pypiwin32 ; sys_platform == 'win32'
61-
62-
# Not part of official requirements, but used by some addons
63-
# colorama==0.3.9
44+
xlrd==1.1.0;
6445
gdata==2.0.18
65-
html5lib==1.0.1
46+
html5lib==1.1
6647
odfpy==1.4.1
6748
pyinotify==0.9.6
68-
simplejson==3.17.0
69-
urllib3==1.26.7
49+
simplejson==3.18.0
50+
urllib3==1.26.11
7051

71-
# test / lint
72-
# those libs and their dependencies are unpinned
73-
# to always test with the last version of it
7452
flake8
7553
pytest>=5.4.2
7654
pluggy
@@ -81,18 +59,18 @@ watchdog
8159

8260
# Library dependency
8361
argh==0.26.2
84-
atomicwrites==1.1.5
85-
attrs==18.1.0
86-
beautifulsoup4==4.6.0
87-
future==0.16.0
88-
mccabe==0.6.1
89-
more-itertools==4.2.0
62+
atomicwrites==1.4.1
63+
attrs==22.1.0
64+
beautifulsoup4==4.11.1
65+
future==0.18.2
66+
mccabe==0.7.0
67+
more-itertools==9.0.0
9068
pathtools==0.1.2
91-
pbr==4.0.4
92-
pexpect==4.6.0
93-
ptyprocess==0.5.2
94-
py==1.5.3
95-
pycodestyle==2.5.0
96-
pyflakes==2.1.1
69+
pbr==5.11.0
70+
pexpect==4.8.0
71+
ptyprocess==0.7.0
72+
py==1.11.0
73+
pycodestyle==2.10.0
74+
pyflakes==3.0.1
9775
unicodecsv==0.14.1
98-
wrapt==1.10.11
76+
wrapt==1.14.1

‎16.0/base_requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ psutil==5.9.4
2323
psycopg2==2.9.5
2424
pydot==1.4.2
2525
python-ldap==3.4.3
26-
PyPDF2==1.28.6
26+
PyPDF2==1.27.12
2727
pyserial==3.5
2828
python-dateutil==2.8.2
2929
pytz==2022.6

‎update_base_requirement‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ wget https://raw.githubusercontent.com/camptocamp/docker-odoo-project/master/16.
77
rm -rf 14.0/base_requirements.txt
88
wget https://raw.githubusercontent.com/camptocamp/docker-odoo-project/master/14.0/base_requirements.txt -O 14.0/base_requirements.txt
99

10+
rm -rf 12.0/base_requirements.txt
11+
wget https://raw.githubusercontent.com/camptocamp/docker-odoo-project/master/12.0/base_requirements.txt -O 12.0/base_requirements.txt
12+
1013

1114
echo "File have been updated from C2C project, please check it 'git diff' and remove marabunta/anthem tools"

0 commit comments

Comments
 (0)