fixup! fixup! fixup! fixup! fixup! fix: new flovar

camptocamp · Dec 4, 2024 · c59cc49 · c59cc49
1 parent ced9a07
commit c59cc49
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/17.0/Dockerfile b/17.0/Dockerfile
@@ -17,8 +17,6 @@ ENV BUILD_PACKAGE \
     git
 
 # run in a virtualenv
-RUN python3 -m venv .venv
-RUN . .venv/bin/activate
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
 # wkhtml-buster is kept as in official image, no deb available for bullseye
 RUN set -x; \
@@ -51,6 +49,12 @@ RUN adduser --disabled-password -u $UID --gecos '' odoo \
 
 VOLUME ["/data/odoo", "/var/log/odoo"]
 USER odoo
+#RUN python3 -m venv /odoo/.venv  --system-site-packages
+#RUN . /odoo/.venv/bin/activate
+
+RUN set -x; \
+        sh -c pip install -r /odoo/base_requirements.txt --ignore-installed 
+
 # Expose Odoo services
 EXPOSE 8069 8072
 

diff --git a/17.0/base_requirements.txt b/17.0/base_requirements.txt
@@ -5,6 +5,7 @@ lxml-html-clean==0.4.1
 
 
 # Migration tools
-marabunta==0.12.0
+#marabunta==0.12.0
+-e git+https://github.com/camptocamp/marabunta@disutilsremoved#egg=marabunta
 -e git+https://github.com/camptocamp/anthem@master#egg=anthem
 
diff --git a/example/Dockerfile b/example/Dockerfile
@@ -26,6 +26,8 @@ RUN set -x; \
 #COPY ./requirements.txt /odoo/
 USER odoo
 WORKDIR /odoo
+# run in a virtualenv
+
 RUN pip install --user -e .
 #RUN pip install --user -r requirements.txt 
 

diff --git a/install/package_odoo_common_custom.sh b/install/package_odoo_common_custom.sh
@@ -28,4 +28,5 @@ apt-get install -y --no-install-recommends \
  python3-pyflakes \
  python3-unicodecsv \
  python3-wrapt \
- python3-distutils 
+ python3-distutils \
+ python3-apt