Skip to content

Commit fa8affc

Browse files
TardoTardo
committed
fix: odoo install
1 parent 97777d5 commit fa8affc

23 files changed

Lines changed: 102 additions & 89 deletions

‎10.0.Dockerfile‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ RUN set -eux; \
135135
WORKDIR /opt/odoo
136136

137137
# Install Odoo PIP & Extra dependencies
138-
ARG ODOO_EXTRA_PIP_PKGS="click-odoo click-odoo-contrib" \
139-
PIP_SHA256="40ee07eac6674b8d60fce2bbabc148cf0e2f1408c167683f110fd608b8d6f416"
138+
ARG PIP_SHA256="40ee07eac6674b8d60fce2bbabc148cf0e2f1408c167683f110fd608b8d6f416"
140139

141140
RUN set -eux; \
142141
curl -L -o get-pip.py "https://bootstrap.pypa.io/pip/${ODOO_PYTHON_VERSION}/get-pip.py"; \
@@ -145,11 +144,7 @@ RUN set -eux; \
145144
rm -f get-pip.py; \
146145
"$PYTHON_ODOO_BIN_NAME" -m pip install --no-cache-dir --upgrade pip; \
147146
"$PYTHON_ODOO_BIN_NAME" -m pip install --no-cache-dir virtualenv; \
148-
"$PYTHON_ODOO_BIN_NAME" -m virtualenv /opt/odoo/.venv; \
149-
. .venv/bin/activate; \
150-
pip install --no-cache-dir ${ODOO_EXTRA_PIP_PKGS}; \
151-
pip cache purge; \
152-
deactivate;
147+
"$PYTHON_ODOO_BIN_NAME" -m virtualenv /opt/odoo/.venv;
153148

154149

155150
# System Post-Configurations
@@ -246,10 +241,10 @@ ONBUILD WORKDIR /opt/odoo/git/odoo
246241
# hadolint ignore=DL3042
247242
ONBUILD RUN set -ex; \
248243
. /opt/odoo/.venv/bin/activate; \
249-
printf '#!/bin/bash\n/opt/odoo/git/odoo/odoo-bin "$@"' > /opt/odoo/.venv/bin/odoo; \
250-
chmod +x /opt/odoo/.venv/bin/odoo; \
251244
mv /opt/odoo/constraints.txt .;\
252245
pip install --no-binary psycopg2 -r requirements.txt -c constraints.txt; \
246+
sed -i "s/'PIL'/'Pillow'/" setup.py; \
247+
python setup.py install; \
253248
pip install -r /opt/odoo/pip.txt; \
254249
# Cleanup
255250
pip cache purge; \

‎11.0.Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,12 @@ ONBUILD WORKDIR /opt/odoo/git/odoo
248248
# hadolint ignore=DL3042
249249
ONBUILD RUN set -ex; \
250250
. /opt/odoo/.venv/bin/activate; \
251-
printf '#!/bin/bash\n/opt/odoo/git/odoo/odoo-bin "$@"' > /opt/odoo/.venv/bin/odoo; \
252-
chmod +x /opt/odoo/.venv/bin/odoo; \
253251
# Hard-Change pinned versions
254252
sed -i \
255253
-e '/^pytz==/c\pytz>=2025.2' \
256254
requirements.txt; \
257255
pip install --no-binary psycopg2 -r requirements.txt; \
256+
python setup.py install; \
258257
pip install -r /opt/odoo/pip.txt; \
259258
# Cleanup
260259
pip cache purge; \

‎12.0.Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,12 @@ ONBUILD WORKDIR /opt/odoo/git/odoo
246246
# hadolint ignore=DL3042
247247
ONBUILD RUN set -ex; \
248248
. /opt/odoo/.venv/bin/activate; \
249-
printf '#!/bin/bash\n/opt/odoo/git/odoo/odoo-bin "$@"' > /opt/odoo/.venv/bin/odoo; \
250-
chmod +x /opt/odoo/.venv/bin/odoo; \
251249
# Hard-Change pinned versions
252250
sed -i \
253251
-e '/^pytz==/c\pytz>=2025.2' \
254252
requirements.txt; \
255253
pip install --no-binary psycopg2 -r requirements.txt; \
254+
python setup.py install; \
256255
pip install -r /opt/odoo/pip.txt; \
257256
# Cleanup
258257
pip cache purge; \

‎13.0.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,14 +245,14 @@ ONBUILD WORKDIR /opt/odoo/git/odoo
245245
# hadolint ignore=DL3042
246246
ONBUILD RUN set -ex; \
247247
. /opt/odoo/.venv/bin/activate; \
248-
printf '#!/bin/bash\n/opt/odoo/git/odoo/odoo-bin "$@"' > /opt/odoo/.venv/bin/odoo; \
249-
chmod +x /opt/odoo/.venv/bin/odoo; \
250248
# Hard-Change pinned versions
251249
sed -i \
252250
-e '/^pytz==/c\pytz>=2025.2' \
253251
-e '/^vatnumber==/c\python-stdnum>=1.13,<1.15' \
254252
requirements.txt; \
255253
pip install --no-binary psycopg2 -r requirements.txt; \
254+
sed -i "s/'vatnumber'/'python-stdnum'/" setup.py; \
255+
python setup.py install; \
256256
pip install -r /opt/odoo/pip.txt; \
257257
# Cleanup
258258
pip cache purge; \

‎14.0.Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,8 @@ ONBUILD WORKDIR /opt/odoo/git/odoo
233233
# hadolint ignore=DL3042
234234
ONBUILD RUN set -ex; \
235235
. /opt/odoo/.venv/bin/activate; \
236-
printf '#!/bin/bash\n/opt/odoo/git/odoo/odoo-bin "$@"' > /opt/odoo/.venv/bin/odoo; \
237-
chmod +x /opt/odoo/.venv/bin/odoo; \
238236
uv pip install --no-cache-dir --no-binary psycopg2 -r requirements.txt; \
237+
python setup.py install; \
239238
uv pip install --no-cache-dir -r /opt/odoo/pip.txt; \
240239
# Cleanup
241240
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \

‎15.0.Dockerfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ RUN set -eux; \
103103

104104

105105
# Install & activate UV
106-
ARG ODOO_PYTHON_VERSION="3.8" \
106+
ARG ODOO_PYTHON_VERSION="3.9" \
107107
SYSTEM_PYTHON_VERSION="3.13"
108108
ENV PATH="/home/odoo/.local/bin:/home/odoo/.uv-python/bin:$PATH" \
109109
UV_PYTHON_INSTALL_DIR="/home/odoo/.uv-python" \
@@ -143,6 +143,7 @@ RUN set -eux; \
143143
# System Post-Configurations
144144
USER root
145145

146+
COPY --chown=odoo:odoo recipes/15.0/overrides.txt /opt/odoo/overrides.txt
146147
COPY docker-entrypoint.sh /usr/local/sbin/
147148
COPY tools/exec_env.sh /usr/local/sbin/exec_env
148149
COPY tools/isodoo_generate_config.py /usr/local/sbin/isodoo_generate_config
@@ -233,9 +234,9 @@ ONBUILD WORKDIR /opt/odoo/git/odoo
233234
# hadolint ignore=DL3042
234235
ONBUILD RUN set -ex; \
235236
. /opt/odoo/.venv/bin/activate; \
236-
printf '#!/bin/bash\n/opt/odoo/git/odoo/odoo-bin "$@"' > /opt/odoo/.venv/bin/odoo; \
237-
chmod +x /opt/odoo/.venv/bin/odoo; \
238-
uv pip install --no-cache-dir --no-binary psycopg2 -r requirements.txt; \
237+
mv /opt/odoo/overrides.txt .; \
238+
uv pip install --no-cache-dir --no-binary psycopg2 -r requirements.txt --override overrides.txt; \
239+
python setup.py install; \
239240
uv pip install --no-cache-dir -r /opt/odoo/pip.txt; \
240241
# Cleanup
241242
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \

‎16.0.Dockerfile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,8 @@ ONBUILD WORKDIR /opt/odoo/git/odoo
234234
# hadolint ignore=DL3042
235235
ONBUILD RUN set -ex; \
236236
. /opt/odoo/.venv/bin/activate; \
237-
printf '#!/bin/bash\n/opt/odoo/git/odoo/odoo-bin "$@"' > /opt/odoo/.venv/bin/odoo; \
238-
chmod +x /opt/odoo/.venv/bin/odoo; \
239-
mv /opt/odoo/overrides.txt .;\
240-
uv pip install --no-cache-dir --no-binary psycopg2 -r requirements.txt --override overrides.txt; \
237+
mv /opt/odoo/overrides.txt .; \
238+
uv pip install --no-cache-dir --no-binary psycopg2 -e . --override overrides.txt; \
241239
uv pip install --no-cache-dir -r /opt/odoo/pip.txt; \
242240
# Cleanup
243241
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \

‎17.0.Dockerfile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,8 @@ ONBUILD WORKDIR /opt/odoo/git/odoo
234234
# hadolint ignore=DL3042
235235
ONBUILD RUN set -ex; \
236236
. /opt/odoo/.venv/bin/activate; \
237-
printf '#!/bin/bash\n/opt/odoo/git/odoo/odoo-bin "$@"' > /opt/odoo/.venv/bin/odoo; \
238-
chmod +x /opt/odoo/.venv/bin/odoo; \
239-
mv /opt/odoo/overrides.txt .;\
240-
uv pip install --no-cache-dir --no-binary psycopg2 -r requirements.txt --override overrides.txt; \
237+
mv /opt/odoo/overrides.txt .; \
238+
uv pip install --no-cache-dir --no-binary psycopg2 -e . --override overrides.txt; \
241239
uv pip install --no-cache-dir -r /opt/odoo/pip.txt; \
242240
# Cleanup
243241
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \

‎18.0.Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ RUN set -eux; \
103103

104104

105105
# Install & activate UV
106-
ARG ODOO_PYTHON_VERSION="3.13" \
106+
ARG ODOO_PYTHON_VERSION="3.12" \
107107
SYSTEM_PYTHON_VERSION="3.13"
108108
ENV PATH="/home/odoo/.local/bin:/home/odoo/.uv-python/bin:$PATH" \
109109
UV_PYTHON_INSTALL_DIR="/home/odoo/.uv-python" \
@@ -143,6 +143,7 @@ RUN set -eux; \
143143
# System Post-Configurations
144144
USER root
145145

146+
COPY --chown=odoo:odoo recipes/18.0/overrides.txt /opt/odoo/overrides.txt
146147
COPY docker-entrypoint.sh /usr/local/sbin/
147148
COPY tools/exec_env.sh /usr/local/sbin/exec_env
148149
COPY tools/isodoo_generate_config.py /usr/local/sbin/isodoo_generate_config
@@ -233,9 +234,8 @@ ONBUILD WORKDIR /opt/odoo/git/odoo
233234
# hadolint ignore=DL3042
234235
ONBUILD RUN set -ex; \
235236
. /opt/odoo/.venv/bin/activate; \
236-
printf '#!/bin/bash\n/opt/odoo/git/odoo/odoo-bin "$@"' > /opt/odoo/.venv/bin/odoo; \
237-
chmod +x /opt/odoo/.venv/bin/odoo; \
238-
uv pip install --no-cache-dir --no-binary psycopg2 -r requirements.txt; \
237+
mv /opt/odoo/overrides.txt .;\
238+
uv pip install --no-cache-dir --no-binary psycopg2 -e . --override overrides.txt; \
239239
uv pip install --no-cache-dir -r /opt/odoo/pip.txt; \
240240
# Cleanup
241241
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \

‎19.0.Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,7 @@ ONBUILD WORKDIR /opt/odoo/git/odoo
233233
# hadolint ignore=DL3042
234234
ONBUILD RUN set -ex; \
235235
. /opt/odoo/.venv/bin/activate; \
236-
printf '#!/bin/bash\n/opt/odoo/git/odoo/odoo-bin "$@"' > /opt/odoo/.venv/bin/odoo; \
237-
chmod +x /opt/odoo/.venv/bin/odoo; \
238-
uv pip install --no-cache-dir --no-binary psycopg2 -r requirements.txt; \
236+
uv pip install --no-cache-dir --no-binary psycopg2 -e .; \
239237
uv pip install --no-cache-dir -r /opt/odoo/pip.txt; \
240238
# Cleanup
241239
find .. -maxdepth 3 -name "build" -type d -exec rm -rf {} +; \

0 commit comments

Comments
 (0)