From 73006ba003ac2bee80eb69a0a24112dafcd09862 Mon Sep 17 00:00:00 2001
From: sparer <sparer@tower.xyz>
Date: Tue, 30 Aug 2022 21:01:40 +0200
Subject: [PATCH 1/2] Python version 3.10.1 Pyinstaller version 5.3

---
 Dockerfile-py3-win64 | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Dockerfile-py3-win64 b/Dockerfile-py3-win64
index e98284e..b212742 100644
--- a/Dockerfile-py3-win64
+++ b/Dockerfile-py3-win64
@@ -1,16 +1,17 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 ARG WINE_VERSION=winehq-staging
-ARG PYTHON_VERSION=3.7.5
-ARG PYINSTALLER_VERSION=3.6
+ARG PYTHON_VERSION=3.10.1
+ARG PYINSTALLER_VERSION=5.3
+ARG PYFOLDER=Python310
 
 # we need wine for this all to work, so we'll use the PPA
 RUN set -x \
     && dpkg --add-architecture i386 \
     && apt-get update -qy \
-    && apt-get install --no-install-recommends -qfy apt-transport-https software-properties-common wget \
+    && apt-get install --no-install-recommends -qfy apt-transport-https software-properties-common wget gpg-agent rename \
     && wget -nv https://dl.winehq.org/wine-builds/winehq.key \
     && apt-key add winehq.key \
     && add-apt-repository 'https://dl.winehq.org/wine-builds/ubuntu/' \
@@ -37,17 +38,17 @@ RUN set -x \
     && winetricks win7 \
     && for msifile in `echo core dev exe lib path pip tcltk tools`; do \
         wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/amd64/${msifile}.msi"; \
-        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python37; \
+        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python310; \
         rm ${msifile}.msi; \
     done \
-    && cd /wine/drive_c/Python37 \
-    && echo 'wine '\''C:\Python37\python.exe'\'' "$@"' > /usr/bin/python \
-    && echo 'wine '\''C:\Python37\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
-    && echo 'wine '\''C:\Python37\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
-    && echo 'wine '\''C:\Python37\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
-    && echo 'wine '\''C:\Python37\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
+    && cd /wine/drive_c/Python310 \
+    && echo 'wine '\''C:\Python310\python.exe'\'' "$@"' > /usr/bin/python \
+    && echo 'wine '\''C:\Python310\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
+    && echo 'wine '\''C:\Python310\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
+    && echo 'wine '\''C:\Python310\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
+    && echo 'wine '\''C:\Python310\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
     && echo 'assoc .py=PythonScript' | wine cmd \
-    && echo 'ftype PythonScript=c:\Python37\python.exe "%1" %*' | wine cmd \
+    && echo 'ftype PythonScript=c:\Python310\python.exe "%1" %*' | wine cmd \
     && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \
     && chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyinstaller /usr/bin/pyupdater \
     && (pip install -U pip || true) \

From 8cee8fc7a2fa72596aea8877a2cae649c61ec8b2 Mon Sep 17 00:00:00 2001
From: sparer <sparer@tower.xyz>
Date: Tue, 30 Aug 2022 21:02:51 +0200
Subject: [PATCH 2/2] removed unused variable

---
 Dockerfile-py3-win64 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile-py3-win64 b/Dockerfile-py3-win64
index b212742..fe68966 100644
--- a/Dockerfile-py3-win64
+++ b/Dockerfile-py3-win64
@@ -5,7 +5,6 @@ ENV DEBIAN_FRONTEND noninteractive
 ARG WINE_VERSION=winehq-staging
 ARG PYTHON_VERSION=3.10.1
 ARG PYINSTALLER_VERSION=5.3
-ARG PYFOLDER=Python310
 
 # we need wine for this all to work, so we'll use the PPA
 RUN set -x \