Skip to content

Commit aa66ce4

Browse files
TardoTardo
committed
upd: project
1 parent bdaf56e commit aa66ce4

18 files changed

Lines changed: 448 additions & 448 deletions

‎10.0.Dockerfile‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -194,41 +194,41 @@ ONBUILD RUN set -ex; \
194194
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && auto_fill_external_dependencies; \
195195
deactivate; \
196196
. ~/.nvm/nvm.sh; \
197-
xargs npm install -g < /opt/odoo/npm.txt;
197+
xargs -r npm install -g < /opt/odoo/npm.txt;
198198

199199
ONBUILD USER root
200200

201201
ONBUILD RUN set -ex; \
202-
apt-get update; \
203-
xargs apt-get install -y --no-install-recommends < /opt/odoo/apt.txt; \
204-
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
205-
apt-get clean; \
206-
rm -rf /var/lib/apt/lists/*; \
207-
rm -rf /tmp/*;
202+
apt-get update; \
203+
xargs -r apt-get install -y --no-install-recommends < /opt/odoo/apt.txt; \
204+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
205+
apt-get clean; \
206+
rm -rf /var/lib/apt/lists/*; \
207+
rm -rf /tmp/*;
208208

209209
ONBUILD USER odoo
210210

211211
ONBUILD WORKDIR /opt/odoo/odoo
212212

213213
# hadolint ignore=DL3042
214214
ONBUILD RUN set -ex; \
215-
. ../.venv/bin/activate; \
216-
printf '#!/bin/bash\n/opt/odoo/odoo/odoo-bin "$@"' > ../.venv/bin/odoo; \
217-
chmod +x ../.venv/bin/odoo; \
218-
mv /opt/odoo/constraints.txt .;\
219-
pip install --no-binary psycopg2 -r requirements.txt -c constraints.txt; \
220-
pip install -r /opt/odoo/pip.txt; \
221-
# Cleanup
222-
pip cache purge; \
223-
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \
224-
find .. -name "*.egg-info" -type d -exec rm -rf {} +; \
225-
find .. -name "*.pyc" -type f -delete; \
226-
rm -rf /tmp/*; \
227-
# Post-configurations
228-
python -m compileall /var/lib/odoo/; \
229-
# Ensure all is working
230-
odoo --version; \
231-
deactivate;
215+
. ../.venv/bin/activate; \
216+
printf '#!/bin/bash\n/opt/odoo/odoo/odoo-bin "$@"' > ../.venv/bin/odoo; \
217+
chmod +x ../.venv/bin/odoo; \
218+
mv /opt/odoo/constraints.txt .;\
219+
pip install --no-binary psycopg2 -r requirements.txt -c constraints.txt; \
220+
pip install -r /opt/odoo/pip.txt; \
221+
# Cleanup
222+
pip cache purge; \
223+
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \
224+
find .. -name "*.egg-info" -type d -exec rm -rf {} +; \
225+
find .. -name "*.pyc" -type f -delete; \
226+
rm -rf /tmp/*; \
227+
# Post-configurations
228+
python -m compileall /var/lib/odoo/; \
229+
# Ensure all is working
230+
odoo --version; \
231+
deactivate;
232232

233233

234234
ONBUILD WORKDIR /opt/odoo

‎11.0.Dockerfile‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -193,44 +193,44 @@ ONBUILD RUN set -ex; \
193193
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && auto_fill_external_dependencies; \
194194
deactivate; \
195195
. ~/.nvm/nvm.sh; \
196-
xargs npm install -g < /opt/odoo/npm.txt;
196+
xargs -r npm install -g < /opt/odoo/npm.txt;
197197

198198
ONBUILD USER root
199199

200200
ONBUILD RUN set -ex; \
201-
apt-get update; \
202-
xargs apt-get install -y --no-install-recommends < /opt/odoo/apt.txt; \
203-
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
204-
apt-get clean; \
205-
rm -rf /var/lib/apt/lists/*; \
206-
rm -rf /tmp/*;
201+
apt-get update; \
202+
xargs -r apt-get install -y --no-install-recommends < /opt/odoo/apt.txt; \
203+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
204+
apt-get clean; \
205+
rm -rf /var/lib/apt/lists/*; \
206+
rm -rf /tmp/*;
207207

208208
ONBUILD USER odoo
209209

210210
ONBUILD WORKDIR /opt/odoo/odoo
211211

212212
# hadolint ignore=DL3042
213213
ONBUILD RUN set -ex; \
214-
. ../.venv/bin/activate; \
215-
printf '#!/bin/bash\n/opt/odoo/odoo/odoo-bin "$@"' > ../.venv/bin/odoo; \
216-
chmod +x ../.venv/bin/odoo; \
217-
# Hard-Change pinned versions
218-
sed -i \
219-
-e '/^pytz==/c\pytz>=2025.2' \
220-
requirements.txt; \
221-
pip install --no-binary psycopg2 -r requirements.txt; \
222-
pip install -r /opt/odoo/pip.txt; \
223-
# Cleanup
224-
pip cache purge; \
225-
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \
226-
find .. -name "*.egg-info" -type d -exec rm -rf {} +; \
227-
find .. -name "*.pyc" -type f -delete; \
228-
rm -rf /tmp/*; \
229-
# Post-configurations
230-
python -m compileall /var/lib/odoo/; \
231-
# Ensure all is working
232-
odoo --version; \
233-
deactivate;
214+
. ../.venv/bin/activate; \
215+
printf '#!/bin/bash\n/opt/odoo/odoo/odoo-bin "$@"' > ../.venv/bin/odoo; \
216+
chmod +x ../.venv/bin/odoo; \
217+
# Hard-Change pinned versions
218+
sed -i \
219+
-e '/^pytz==/c\pytz>=2025.2' \
220+
requirements.txt; \
221+
pip install --no-binary psycopg2 -r requirements.txt; \
222+
pip install -r /opt/odoo/pip.txt; \
223+
# Cleanup
224+
pip cache purge; \
225+
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \
226+
find .. -name "*.egg-info" -type d -exec rm -rf {} +; \
227+
find .. -name "*.pyc" -type f -delete; \
228+
rm -rf /tmp/*; \
229+
# Post-configurations
230+
python -m compileall /var/lib/odoo/; \
231+
# Ensure all is working
232+
odoo --version; \
233+
deactivate;
234234

235235

236236
ONBUILD WORKDIR /opt/odoo

‎12.0.Dockerfile‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -193,44 +193,44 @@ ONBUILD RUN set -ex; \
193193
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && auto_fill_external_dependencies; \
194194
deactivate; \
195195
. ~/.nvm/nvm.sh; \
196-
xargs npm install -g < /opt/odoo/npm.txt;
196+
xargs -r npm install -g < /opt/odoo/npm.txt;
197197

198198
ONBUILD USER root
199199

200200
ONBUILD RUN set -ex; \
201-
apt-get update; \
202-
xargs apt-get install -y --no-install-recommends < /opt/odoo/apt.txt; \
203-
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
204-
apt-get clean; \
205-
rm -rf /var/lib/apt/lists/*; \
206-
rm -rf /tmp/*;
201+
apt-get update; \
202+
xargs -r apt-get install -y --no-install-recommends < /opt/odoo/apt.txt; \
203+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
204+
apt-get clean; \
205+
rm -rf /var/lib/apt/lists/*; \
206+
rm -rf /tmp/*;
207207

208208
ONBUILD USER odoo
209209

210210
ONBUILD WORKDIR /opt/odoo/odoo
211211

212212
# hadolint ignore=DL3042
213213
ONBUILD RUN set -ex; \
214-
. ../.venv/bin/activate; \
215-
printf '#!/bin/bash\n/opt/odoo/odoo/odoo-bin "$@"' > ../.venv/bin/odoo; \
216-
chmod +x ../.venv/bin/odoo; \
217-
# Hard-Change pinned versions
218-
sed -i \
219-
-e '/^pytz==/c\pytz>=2025.2' \
220-
requirements.txt; \
221-
pip install --no-binary psycopg2 -r requirements.txt; \
222-
pip install -r /opt/odoo/pip.txt; \
223-
# Cleanup
224-
pip cache purge; \
225-
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \
226-
find .. -name "*.egg-info" -type d -exec rm -rf {} +; \
227-
find .. -name "*.pyc" -type f -delete; \
228-
rm -rf /tmp/*; \
229-
# Post-configurations
230-
python -m compileall /var/lib/odoo/; \
231-
# Ensure all is working
232-
odoo --version; \
233-
deactivate;
214+
. ../.venv/bin/activate; \
215+
printf '#!/bin/bash\n/opt/odoo/odoo/odoo-bin "$@"' > ../.venv/bin/odoo; \
216+
chmod +x ../.venv/bin/odoo; \
217+
# Hard-Change pinned versions
218+
sed -i \
219+
-e '/^pytz==/c\pytz>=2025.2' \
220+
requirements.txt; \
221+
pip install --no-binary psycopg2 -r requirements.txt; \
222+
pip install -r /opt/odoo/pip.txt; \
223+
# Cleanup
224+
pip cache purge; \
225+
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \
226+
find .. -name "*.egg-info" -type d -exec rm -rf {} +; \
227+
find .. -name "*.pyc" -type f -delete; \
228+
rm -rf /tmp/*; \
229+
# Post-configurations
230+
python -m compileall /var/lib/odoo/; \
231+
# Ensure all is working
232+
odoo --version; \
233+
deactivate;
234234

235235

236236
ONBUILD WORKDIR /opt/odoo

‎13.0.Dockerfile‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -184,54 +184,54 @@ ONBUILD USER odoo
184184
ONBUILD WORKDIR /opt/odoo
185185

186186
ONBUILD RUN set -ex; \
187-
. ~/.venv/bin/activate; \
188-
[ "$AUTO_FILL_REPOS" = true ] && auto_fill_repos; \
189-
gitaggregate -c repos.yaml --expand-env; \
190-
chmod +x /opt/odoo/odoo/odoo-bin; \
191-
create_addons_symlinks; \
192-
[ "$VERIFY_MISSING_MODULES" = true ] && check_addons_dependencies; \
193-
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && auto_fill_external_dependencies; \
194-
deactivate; \
195-
. ~/.nvm/nvm.sh; \
196-
xargs npm install -g < /opt/odoo/npm.txt;
187+
. ~/.venv/bin/activate; \
188+
[ "$AUTO_FILL_REPOS" = true ] && auto_fill_repos; \
189+
gitaggregate -c repos.yaml --expand-env; \
190+
chmod +x /opt/odoo/odoo/odoo-bin; \
191+
create_addons_symlinks; \
192+
[ "$VERIFY_MISSING_MODULES" = true ] && check_addons_dependencies; \
193+
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && auto_fill_external_dependencies; \
194+
deactivate; \
195+
. ~/.nvm/nvm.sh; \
196+
xargs -r npm install -g < /opt/odoo/npm.txt;
197197

198198
ONBUILD USER root
199199

200200
ONBUILD RUN set -ex; \
201-
apt-get update; \
202-
xargs apt-get install -y --no-install-recommends < /opt/odoo/apt.txt; \
203-
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
204-
apt-get clean; \
205-
rm -rf /var/lib/apt/lists/*; \
206-
rm -rf /tmp/*;
201+
apt-get update; \
202+
xargs -r apt-get install -y --no-install-recommends < /opt/odoo/apt.txt; \
203+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
204+
apt-get clean; \
205+
rm -rf /var/lib/apt/lists/*; \
206+
rm -rf /tmp/*;
207207

208208
ONBUILD USER odoo
209209

210210
ONBUILD WORKDIR /opt/odoo/odoo
211211

212212
# hadolint ignore=DL3042
213213
ONBUILD RUN set -ex; \
214-
. ../.venv/bin/activate; \
215-
printf '#!/bin/bash\n/opt/odoo/odoo/odoo-bin "$@"' > ../.venv/bin/odoo; \
216-
chmod +x ../.venv/bin/odoo; \
217-
# Hard-Change pinned versions
218-
sed -i \
219-
-e '/^pytz==/c\pytz>=2025.2' \
220-
-e '/^vatnumber==/c\python-stdnum>=1.13,<1.15' \
221-
requirements.txt; \
222-
pip install --no-binary psycopg2 -r requirements.txt; \
223-
pip install -r /opt/odoo/pip.txt; \
224-
# Cleanup
225-
pip cache purge; \
226-
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \
227-
find .. -name "*.egg-info" -type d -exec rm -rf {} +; \
228-
find .. -name "*.pyc" -type f -delete; \
229-
rm -rf /tmp/*; \
230-
# Post-configurations
231-
python -m compileall /var/lib/odoo/; \
232-
# Ensure all is working
233-
odoo --version; \
234-
deactivate;
214+
. ../.venv/bin/activate; \
215+
printf '#!/bin/bash\n/opt/odoo/odoo/odoo-bin "$@"' > ../.venv/bin/odoo; \
216+
chmod +x ../.venv/bin/odoo; \
217+
# Hard-Change pinned versions
218+
sed -i \
219+
-e '/^pytz==/c\pytz>=2025.2' \
220+
-e '/^vatnumber==/c\python-stdnum>=1.13,<1.15' \
221+
requirements.txt; \
222+
pip install --no-binary psycopg2 -r requirements.txt; \
223+
pip install -r /opt/odoo/pip.txt; \
224+
# Cleanup
225+
pip cache purge; \
226+
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \
227+
find .. -name "*.egg-info" -type d -exec rm -rf {} +; \
228+
find .. -name "*.pyc" -type f -delete; \
229+
rm -rf /tmp/*; \
230+
# Post-configurations
231+
python -m compileall /var/lib/odoo/; \
232+
# Ensure all is working
233+
odoo --version; \
234+
deactivate;
235235

236236

237237
ONBUILD WORKDIR /opt/odoo

‎14.0.Dockerfile‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -177,49 +177,49 @@ ONBUILD USER odoo
177177
ONBUILD WORKDIR /opt/odoo
178178

179179
ONBUILD RUN set -ex; \
180-
. ~/.venv/bin/activate; \
181-
[ "$AUTO_FILL_REPOS" = true ] && auto_fill_repos; \
182-
gitaggregate -c repos.yaml --expand-env; \
183-
chmod +x /opt/odoo/odoo/odoo-bin; \
184-
create_addons_symlinks; \
185-
[ "$VERIFY_MISSING_MODULES" = true ] && check_addons_dependencies; \
186-
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && auto_fill_external_dependencies; \
187-
deactivate; \
188-
. ~/.nvm/nvm.sh; \
189-
xargs npm install -g < /opt/odoo/npm.txt;
180+
. ~/.venv/bin/activate; \
181+
[ "$AUTO_FILL_REPOS" = true ] && auto_fill_repos; \
182+
gitaggregate -c repos.yaml --expand-env; \
183+
chmod +x /opt/odoo/odoo/odoo-bin; \
184+
create_addons_symlinks; \
185+
[ "$VERIFY_MISSING_MODULES" = true ] && check_addons_dependencies; \
186+
[ "$AUTO_DOWNLOAD_DEPENDENCIES" = true ] && auto_fill_external_dependencies; \
187+
deactivate; \
188+
. ~/.nvm/nvm.sh; \
189+
xargs -r npm install -g < /opt/odoo/npm.txt;
190190

191191
ONBUILD USER root
192192

193193
ONBUILD RUN set -ex; \
194-
apt-get update; \
195-
xargs apt-get install -y --no-install-recommends < /opt/odoo/apt.txt; \
196-
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
197-
apt-get clean; \
198-
rm -rf /var/lib/apt/lists/*; \
199-
rm -rf /tmp/*;
194+
apt-get update; \
195+
xargs -r apt-get install -y --no-install-recommends < /opt/odoo/apt.txt; \
196+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
197+
apt-get clean; \
198+
rm -rf /var/lib/apt/lists/*; \
199+
rm -rf /tmp/*;
200200

201201
ONBUILD USER odoo
202202

203203
ONBUILD WORKDIR /opt/odoo/odoo
204204

205205
# hadolint ignore=DL3042
206206
ONBUILD RUN set -ex; \
207-
. /opt/odoo/.venv/bin/activate; \
208-
printf '#!/bin/bash\n/opt/odoo/odoo/odoo-bin "$@"' > ../.venv/bin/odoo; \
209-
chmod +x ../.venv/bin/odoo; \
210-
mv /opt/odoo/overrides.txt .;\
211-
uv pip install --no-binary psycopg2 -r requirements.txt --override overrides.txt; \
212-
uv pip install -r /opt/odoo/pip.txt; \
213-
# Cleanup
214-
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \
215-
find .. -name "*.egg-info" -type d -exec rm -rf {} +; \
216-
find .. -name "*.pyc" -type f -delete; \
217-
rm -rf /tmp/*; \
218-
# Post-configurations
219-
python -m compileall /var/lib/odoo/; \
220-
# Ensure all is working
221-
odoo --version; \
222-
deactivate;
207+
. /opt/odoo/.venv/bin/activate; \
208+
printf '#!/bin/bash\n/opt/odoo/odoo/odoo-bin "$@"' > ../.venv/bin/odoo; \
209+
chmod +x ../.venv/bin/odoo; \
210+
mv /opt/odoo/overrides.txt .;\
211+
uv pip install --no-binary psycopg2 -r requirements.txt --override overrides.txt; \
212+
uv pip install -r /opt/odoo/pip.txt; \
213+
# Cleanup
214+
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \
215+
find .. -name "*.egg-info" -type d -exec rm -rf {} +; \
216+
find .. -name "*.pyc" -type f -delete; \
217+
rm -rf /tmp/*; \
218+
# Post-configurations
219+
python -m compileall /var/lib/odoo/; \
220+
# Ensure all is working
221+
odoo --version; \
222+
deactivate;
223223

224224

225225
ONBUILD WORKDIR /opt/odoo

0 commit comments

Comments
 (0)