python3Pyside2QML: Fix the Dockerfiles

Fix the Dockerfiles to use the qt5-wayland and qt5-wayland-vivante base
containers and therefor remove the packages manually installed by this
other opengles container.

Signed-off-by: Andre Riesco <andre.riesco@toradex.com>

python3Pyside2QML/Dockerfile

@@ -4,12 +4,10 @@
 ##
 ARG IMAGE_ARCH=
 
-
-
 ##
 # Base container version
 ##
-ARG BASE_VERSION=3.1.0
+ARG BASE_VERSION=3.2.1
 
 ARG APP_ROOT=
 
@@ -18,39 +16,15 @@ ARG APP_ROOT=
 ##
 ARG GPU=
 
-FROM --platform=linux/${IMAGE_ARCH} \
-     torizon/wayland-base${GPU}:${BASE_VERSION} AS opengles
-
-ARG IMAGE_ARCH
-ARG GPU
-ARG APP_EXECUTABLE
-ARG APP_ROOT
-
-# Make sure we don't get notifications we can't answer during building.
-ENV DEBIAN_FRONTEND="noninteractive"
-
-# stick to bookworm on /etc/apt/sources.list.d
-RUN sed -i 's/sid/bookworm/g' /etc/apt/sources.list.d/debian.sources
-
-# Install required packages
-RUN apt-get -q -y update && \
-    apt-get -q -y install \
-    libqt5gui5-gles libqt5quick5-gles \
-    && apt-get clean && apt-get autoremove && \
-    rm -rf /var/lib/apt/lists/*
-
 
 FROM --platform=linux/${IMAGE_ARCH} \
-     torizon/wayland-base${GPU}:${BASE_VERSION} AS Deploy
+     torizon/qt5-wayland${GPU}:${BASE_VERSION} AS Deploy
 
 ARG IMAGE_ARCH
 ARG GPU
 ARG APP_EXECUTABLE
 ARG APP_ROOT
 
-# stick to bookworm on /etc/apt/sources.list.d
-RUN sed -i 's/sid/bookworm/g' /etc/apt/sources.list.d/debian.sources
-
 # for vivante GPU we need some "special" sauce
 RUN apt-get -q -y update && \
         if [ "${GPU}" = "-vivante" ] || [ "${GPU}" = "-imx8" ]; then \
@@ -82,20 +56,13 @@ RUN apt-get -q -y update && \
     python3-pyside2.qtnetwork \
     qml-module-qtquick-dialogs \
     qtwayland5 \
-    rsync \
 # DOES NOT REMOVE THIS LABEL: this is used for VS Code automation
     # __torizon_packages_prod_start__
     # __torizon_packages_prod_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && apt-get clean && apt-get autoremove && \
     rm -rf /var/lib/apt/lists/*
 
-# replace the libs from the opengles image
-COPY --from=opengles /usr/lib/aarch64-linux-gnu /usr2/lib/aarch64-linux-gnu
-# rsync the files
-RUN rsync -a /usr2/lib/aarch64-linux-gnu /usr/lib/aarch64-linux-gnu && \
-    rm -rf /usr2
-
 # Create virtualenv
 RUN python3 -m venv ${APP_ROOT}/.venv --system-site-packages
 

python3Pyside2QML/Dockerfile.debug

@@ -4,12 +4,10 @@
 ##
 ARG IMAGE_ARCH=
 
-
-
 ##
 # Base container version
 ##
-ARG BASE_VERSION=3.1.0
+ARG BASE_VERSION=3.2.1
 
 ##
 # Application Name
@@ -33,33 +31,9 @@ ARG APP_ROOT=
 ##
 ARG GPU=
 
-FROM --platform=linux/${IMAGE_ARCH} \
-     torizon/wayland-base${GPU}:${BASE_VERSION} AS opengles
-
-ARG IMAGE_ARCH
-ARG GPU
-ARG SSH_DEBUG_PORT
-ARG APP_EXECUTABLE
-ARG SSHUSERNAME
-ENV APP_EXECUTABLE ${APP_EXECUTABLE}
-ARG APP_ROOT
-
-# Make sure we don't get notifications we can't answer during building.
-ENV DEBIAN_FRONTEND="noninteractive"
-
-# stick to bookworm on /etc/apt/sources.list.d
-RUN sed -i 's/sid/bookworm/g' /etc/apt/sources.list.d/debian.sources
-
-# Install required packages
-RUN apt-get -q -y update && \
-    apt-get -q -y install \
-    libqt5gui5-gles libqt5quick5-gles \
-    && apt-get clean && apt-get autoremove && \
-    rm -rf /var/lib/apt/lists/*
-
 
 FROM --platform=linux/${IMAGE_ARCH} \
-     torizon/wayland-base${GPU}:${BASE_VERSION} AS Debug
+     torizon/qt5-wayland${GPU}:${BASE_VERSION} AS Debug
 
 ARG IMAGE_ARCH
 ARG GPU
@@ -119,12 +93,6 @@ RUN apt-get -q -y update && \
     && apt-get clean && apt-get autoremove && \
     rm -rf /var/lib/apt/lists/*
 
-# replace the libs from the opengles image
-COPY --from=opengles /usr/lib/aarch64-linux-gnu /usr2/lib/aarch64-linux-gnu
-# rsync the files
-RUN rsync -a /usr2/lib/aarch64-linux-gnu /usr/lib/aarch64-linux-gnu && \
-    rm -rf /usr2
-
 # automate for torizonPackages.json
 RUN apt-get -q -y update && \
     apt-get -q -y install \