From 25019845149c629d8114a89b8317ce6010625031 Mon Sep 17 00:00:00 2001
From: Maxim Slipenko <no-reply@maxim.slipenko.com>
Date: Mon, 28 Aug 2023 12:02:17 +0300
Subject: [PATCH] refactor

---
 .../Dockerfile                                | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)
 rename Dockerfile => pyside_builder_manylinux_2_28_x86_64/Dockerfile (57%)

diff --git a/Dockerfile b/pyside_builder_manylinux_2_28_x86_64/Dockerfile
similarity index 57%
rename from Dockerfile
rename to pyside_builder_manylinux_2_28_x86_64/Dockerfile
index 7f88df0..acb9828 100644
--- a/Dockerfile
+++ b/pyside_builder_manylinux_2_28_x86_64/Dockerfile
@@ -1,9 +1,5 @@
 FROM amd64/almalinux:8 as env
 
-ARG AQTINSTALL_VERSION=3.1.6
-ARG QT_VERSION=6.4.2
-ARG PYTHON_VERSION=3.9
-
 RUN yum -y update \
     && yum -y groupinstall 'Development Tools' \
     && yum -y install \
@@ -17,28 +13,21 @@ RUN yum -y update \
         llvm \
         llvm-devel \
         mesa-libGL-devel \
+        pulseaudio-libs-glib2 \
     && dnf --enablerepo=powertools -y install ninja-build \
     && yum clean all \
     && rm -rf /var/cache/yum
 
 COPY ./scripts/install_python.sh ./scripts/install_pipx.sh ./scripts/install_qt.sh /
+ARG PYTHON_VERSION=3.9
 RUN /install_python.sh && rm -f /install_python.sh
 RUN /install_pipx.sh && rm -f /install_pipx.sh
+ARG AQTINSTALL_VERSION=3.1.7
 RUN pipx install aqtinstall==${AQTINSTALL_VERSION}
+ENV PATH=/root/.local/bin:$PATH
+ARG QT_VERSION=6.4.2
 RUN /install_qt.sh && rm -f /install_qt.sh
 
 ENV PATH="/opt/Qt/${QT_VERSION}/gcc_64/bin:$PATH"
-
-RUN cd /opt \
-   && git clone -b ${QT_VERSION} https://code.qt.io/pyside/pyside-setup.git \
-   && cd pyside-setup \
-   && pip3 install -r requirements.txt \
-   && python3 setup.py build --parallel "$(nproc)" --limited-api yes \
-   && mkdir -p /output \
-   && export dir_name=qfpa-py${PYTHON_VERSION}-qt${QT_VERSION}-64bit-release \
-   && tar czvf "/output/$dir_name.tar.gz" -C "./build/$dir_name/install" .
-
-RUN cd /opt/pyside-setup \
-   && python3 setup.py build --parallel "$(nproc)" bdist_wheel --limited-api yes
-
-RUN cp /opt/pyside-setup/dist/* /output
\ No newline at end of file
+ENV QT_VERSION=${QT_VERSION}
+ENV PYTHON_VERSION=${PYTHON_VERSION}
\ No newline at end of file