[fc35] Debug VDI chrome and firefox in fedora 35 distribution

startxfr · Dec 20, 2021 · 76ba23b · 76ba23b
1 parent 35ab8ee
commit 76ba23b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/VDI/chrome/Dockerfile b/VDI/chrome/Dockerfile
@@ -44,16 +44,15 @@ RUN dnf install -yq --nogpgcheck yum-utils && \
         x11vnc \
         fedora-workstation-repositories \
         dnf-plugins-core \
-        pulseaudio \
-        python3-setuptools && \
+        pulseaudio && \
     dnf config-manager --set-enabled google-chrome && \
     dnf install -yq --nogpgcheck google-chrome-stable && \
     package-cleanup --problems && \
     package-cleanup --orphans && \
     dnf remove -yq --skip-broken yum-utils yum && \
     dnf clean all --enablerepo=\* && \
-    pip install --upgrade pip && \
-    pip install --upgrade --force-reinstall setuptools pip && \
+    pip3 install --upgrade pip && \
+    pip3 install --upgrade --force-reinstall pip && \
     useradd -s /bin/bash -m -g 0 -u 1001 -G pulse-access $SX_USER && \
     mkdir -p /s2i $SX_LIBDIR /.local && \
     mv /tmp/s2i/bin/* /s2i/ && \

diff --git a/VDI/firefox/Dockerfile b/VDI/firefox/Dockerfile
@@ -41,14 +41,13 @@ RUN dnf install -yq --nogpgcheck yum-utils && \
         python3-pip \
         xorg-x11-server-Xvfb \
         x11vnc \
-        firefox \
-        python3-setuptools && \
+        firefox && \
     package-cleanup --problems && \
     package-cleanup --orphans && \
     dnf remove -yq --skip-broken yum-utils yum && \
     dnf clean all --enablerepo=\* && \
-    pip install --upgrade pip && \
-    pip install --upgrade --force-reinstall setuptools pip && \
+    pip3 install --upgrade pip && \
+    pip3 install --upgrade --force-reinstall pip && \
     useradd -s /bin/bash -m -g 0 -u 1001 $SX_USER && \
     mkdir -p /s2i $SX_LIBDIR && \
     mv /tmp/s2i/bin/* /s2i/ && \