Try to get additional plugins installed

tronyx · May 14, 2024 · 9603358 · 9603358
1 parent 4bd68a2
commit 9603358
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Dockerfile.linux-amd64 b/Dockerfile.linux-amd64
@@ -222,8 +222,9 @@ RUN cd /opt && \
     #wget -q -O get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
     wget -q https://bootstrap.pypa.io/get-pip.py && \
     #python2 get-pip.py && \
-    python get-pip.py && \
-    pip install --no-cache-dir "pymssql<2.2.0" && \
+    python3 get-pip.py && \
+    #pip install --no-cache-dir "pymssql<2.2.0" && \
+    pip3 install --no-cache-dir pymssql && \
     pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \
     pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \
     git clone https://github.com/willixix/naglio-plugins.git WL-Nagios-Plugins && \

diff --git a/Dockerfile.linux-arm-v7 b/Dockerfile.linux-arm-v7
@@ -231,10 +231,11 @@ RUN cd /opt && \
     #wget -q -O get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
     wget -q https://bootstrap.pypa.io/get-pip.py && \
     #python2 get-pip.py && \
-    python get-pip.py && \
+    python3 get-pip.py && \
     echo "Cython==0.29.35" >> constraints.txt && \
     export PIP_CONSTRAINT="$(pwd)/constraints.txt" && \
-    pip install --no-cache-dir "pymssql<2.2.0" && \
+    #pip install --no-cache-dir "pymssql<2.2.0" && \
+    pip3 install --no-cache-dir pymssql && \
     python3 -m pip install --upgrade pip && \
     pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt bcrypt && \
     pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \

diff --git a/Dockerfile.linux-arm64 b/Dockerfile.linux-arm64
@@ -226,10 +226,11 @@ RUN cd /opt && \
     #wget -q -O get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
     wget -q https://bootstrap.pypa.io/get-pip.py && \
     #python2 get-pip.py && \
-    python get-pip.py && \
+    python3 get-pip.py && \
     echo "Cython==0.29.35" >> constraints.txt && \
     export PIP_CONSTRAINT="$(pwd)/constraints.txt" && \
-    pip install --no-cache-dir "pymssql<2.2.0" && \
+    #pip install --no-cache-dir "pymssql<2.2.0" && \
+    pip3 install --no-cache-dir pymssql && \
     pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ pywbem paramiko pplogger paho-mqtt && \
     pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/ubuntu/ --upgrade requests && \
     git clone https://github.com/willixix/naglio-plugins.git WL-Nagios-Plugins && \