fix(cpu,armnn,cuda): use python3.12

martabal · Jun 19, 2024 · aa9f75c · aa9f75c
1 parent c110066
commit aa9f75c
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/templates/Dockerfile.j2 b/templates/Dockerfile.j2
@@ -46,7 +46,7 @@ RUN \
   echo "**** install build packages ****" && \
   echo "deb [signed-by=/usr/share/keyrings/nodesource-repo.gpg] https://deb.nodesource.com/node_20.x nodistro main" >>/etc/apt/sources.list.d/node.list && \
   curl -s "https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key" | gpg --dearmor | tee /usr/share/keyrings/nodesource-repo.gpg >/dev/null && \
-  {% if machine_learning_provider -%}
+  {% if machine_learning_provider == "openvino" -%}
   echo "deb [signed-by=/usr/share/keyrings/deadsnakes.gpg] https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu noble main" >>/etc/apt/sources.list.d/deadsnakes.list && \
   curl -s "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xF23C5A6CF475977595C89F51BA6932366A755776" | gpg --dearmor | tee /usr/share/keyrings/deadsnakes.gpg >/dev/null && \
   {% endif -%}
@@ -114,16 +114,15 @@ RUN \
     nodejs \
     perl \
     {% if machine_learning_provider -%}
-    python3-pip \
     {% if machine_learning_provider == "openvino" -%}
     python3.10-dev \
     python3.10-venv \
     python3.10 \
-    {% else -%}
-    python3.11-dev \
-    python3.11-venv \
-    python3.11 \
     {% endif -%}
+    python3-dev \
+    python3-pip \
+    python3-venv \
+    python3 \
     {% endif -%}
     zlib1g && \
   if [ $(arch) = "x86_64" ]; then \
@@ -245,7 +244,7 @@ RUN \
   pip install --no-compile --break-system-packages --disable-pip-version-check -U --no-cache-dir \
     poetry \
     virtualenv && \
-  python{% if machine_learning_provider == "openvino" -%}3.10 {% else %}3.11 {% endif -%} -m venv /lsiopy && \
+  {% if machine_learning_provider == "openvino" -%}python3.10 {% else %}python3 {% endif -%} -m venv /lsiopy && \
   poetry config installer.max-workers 10 && \
   poetry config virtualenvs.create false && \
   cp -a \
@@ -292,10 +291,9 @@ RUN \
     {% if machine_learning_provider == "openvino" -%}
     python3.10-dev \
     python3.10-venv \
-    {% else -%}
-    python3.11-dev \
-    python3.11-venv \
     {% endif -%}
+    python3-dev \
+    python3-venv \
     python3-pip \
     {% endif -%}
     autoconf \
@@ -324,7 +322,7 @@ RUN \
   apt-get clean && \
   rm -rf \
     /etc/apt/sources.list.d/node.list \
-    {% if machine_learning_provider -%}
+    {% if machine_learning_provider == "openvino" -%}
     /etc/apt/sources.list.d/deadsnakes.list \
     /usr/share/keyrings/deadsnakes.gpg \
     {% endif -%}