From dce16b0bf644328e23e5183c903c127aadd8a32f Mon Sep 17 00:00:00 2001
From: Jack McKew <jackmckew2@gmail.com>
Date: Sat, 29 Apr 2023 12:09:18 +1000
Subject: [PATCH 1/4] Start working on supporting new versions

---
 Dockerfiles/Dockerfile-py3.10-win64 | 84 +++++++++++++++++++++++++++++
 Dockerfiles/entrypoint.sh           | 45 ++++++++++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 Dockerfiles/Dockerfile-py3.10-win64
 create mode 100644 Dockerfiles/entrypoint.sh

diff --git a/Dockerfiles/Dockerfile-py3.10-win64 b/Dockerfiles/Dockerfile-py3.10-win64
new file mode 100644
index 0000000..b7c088c
--- /dev/null
+++ b/Dockerfiles/Dockerfile-py3.10-win64
@@ -0,0 +1,84 @@
+FROM ubuntu:18.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+ARG WINE_VERSION=winehq-staging
+ARG PYTHON_VERSION=3.10.1
+ARG PYINSTALLER_VERSION=5.3
+
+# 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 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/' \
+    && apt-get update -qy \
+    && apt-get install --no-install-recommends -qfy $WINE_VERSION winbind cabextract \
+    && apt-get clean \
+    && wget -nv https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
+    && chmod +x winetricks \
+    && mv winetricks /usr/local/bin
+
+# wine settings
+ENV WINEARCH win64
+ENV WINEDEBUG fixme-all
+ENV WINEPREFIX /wine
+
+# PYPI repository location
+ENV PYPI_URL=https://pypi.python.org/
+# PYPI index location
+ENV PYPI_INDEX_URL=https://pypi.python.org/simple
+
+# install python in wine, using the msi packages to install, extracting
+# the files directly, since installing isn't running correctly.
+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:/Python310; \
+        rm ${msifile}.msi; \
+    done \
+    && 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:\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) \
+    && rm -rf /tmp/.wine-*
+
+ENV W_DRIVE_C=/wine/drive_c
+ENV W_WINDIR_UNIX="$W_DRIVE_C/windows"
+ENV W_SYSTEM64_DLLS="$W_WINDIR_UNIX/system32"
+ENV W_TMP="$W_DRIVE_C/windows/temp/_$0"
+
+# install Microsoft Visual C++ Redistributable for Visual Studio 2017 dll files
+RUN set -x \
+    && rm -f "$W_TMP"/* \
+    && wget -P "$W_TMP" https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe \
+    && cabextract -q --directory="$W_TMP" "$W_TMP"/VC_redist.x64.exe \
+    && cabextract -q --directory="$W_TMP" "$W_TMP/a10" \
+    && cabextract -q --directory="$W_TMP" "$W_TMP/a11" \
+    && cd "$W_TMP" \
+    && rename 's/_/\-/g' *.dll \
+    && cp "$W_TMP"/*.dll "$W_SYSTEM64_DLLS"/
+
+# install pyinstaller
+RUN /usr/bin/pip install pyinstaller==$PYINSTALLER_VERSION
+
+# put the src folder inside wine
+RUN mkdir /src/ && ln -s /src /wine/drive_c/src
+VOLUME /src/
+WORKDIR /wine/drive_c/src/
+RUN mkdir -p /wine/drive_c/tmp
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/Dockerfiles/entrypoint.sh b/Dockerfiles/entrypoint.sh
new file mode 100644
index 0000000..6b56ba5
--- /dev/null
+++ b/Dockerfiles/entrypoint.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Fail on errors.
+set -e
+
+# Make sure .bashrc is sourced
+. /root/.bashrc
+
+# Allow the workdir to be set using an env var.
+# Useful for CI pipiles which use docker for their build steps
+# and don't allow that much flexibility to mount volumes
+WORKDIR=${SRCDIR:-/src}
+
+#
+# In case the user specified a custom URL for PYPI, then use
+# that one, instead of the default one.
+#
+if [[ "$PYPI_URL" != "https://pypi.python.org/" ]] || \
+   [[ "$PYPI_INDEX_URL" != "https://pypi.python.org/simple" ]]; then
+    # the funky looking regexp just extracts the hostname, excluding port
+    # to be used as a trusted-host.
+    mkdir -p /wine/drive_c/users/root/pip
+    echo "[global]" > /wine/drive_c/users/root/pip/pip.ini
+    echo "index = $PYPI_URL" >> /wine/drive_c/users/root/pip/pip.ini
+    echo "index-url = $PYPI_INDEX_URL" >> /wine/drive_c/users/root/pip/pip.ini
+    echo "trusted-host = $(echo $PYPI_URL | perl -pe 's|^.*?://(.*?)(:.*?)?/.*$|$1|')" >> /wine/drive_c/users/root/pip/pip.ini
+
+    echo "Using custom pip.ini: "
+    cat /wine/drive_c/users/root/pip/pip.ini
+fi
+
+cd $WORKDIR
+
+if [ -f requirements.txt ]; then
+    pip install -r requirements.txt
+fi # [ -f requirements.txt ]
+
+echo "$@"
+
+if [[ "$@" == "" ]]; then
+    pyinstaller --clean -y --dist ./dist/windows --workpath /tmp *.spec
+    chown -R --reference=. ./dist/windows
+else
+    sh -c "$@"
+fi # [[ "$@" == "" ]]

From 04b363697b96859191e4a5b531fd90bbf110a948 Mon Sep 17 00:00:00 2001
From: Jack McKew <jackmckew2@gmail.com>
Date: Mon, 1 May 2023 09:56:43 +1000
Subject: [PATCH 2/4] Use managed dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7f604c0..40c02e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM cdrx/pyinstaller-windows
+FROM jackmckew/pyinstaller-windows
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

From 2dc8dcfca99a8d2eefcdaa53714a1a27b234ca4e Mon Sep 17 00:00:00 2001
From: Jack McKew <jackmckew2@gmail.com>
Date: Mon, 8 May 2023 22:57:16 +1000
Subject: [PATCH 3/4] Add git

---
 Dockerfiles/README.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Dockerfiles/README.md

diff --git a/Dockerfiles/README.md b/Dockerfiles/README.md
new file mode 100644
index 0000000..1edcdfd
--- /dev/null
+++ b/Dockerfiles/README.md
@@ -0,0 +1,6 @@
+# Docker Files
+
+To push new images up to Docker hub
+
+1. `docker login`
+2. `docker build -f Dockerfile-py3.10-win64 . --platform=linux/amd64 -t jackmckew/pyinstaller-windows:3.10 -t jackmckew/pyinstaller-windows:latest && docker push jackmckew/pyinstaller-windows:3.10 && docker push jackmckew/pyinstaller-windows:latest`
\ No newline at end of file

From 1c038a14bdc1576172a8f7af40e353327e249c93 Mon Sep 17 00:00:00 2001
From: Jack McKew <jackmckew2@gmail.com>
Date: Mon, 8 May 2023 22:57:45 +1000
Subject: [PATCH 4/4] Add git

---
 Dockerfiles/Dockerfile-py3.10-win64 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfiles/Dockerfile-py3.10-win64 b/Dockerfiles/Dockerfile-py3.10-win64
index b7c088c..b950a53 100644
--- a/Dockerfiles/Dockerfile-py3.10-win64
+++ b/Dockerfiles/Dockerfile-py3.10-win64
@@ -10,7 +10,7 @@ ARG PYINSTALLER_VERSION=5.3
 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 gpg-agent rename \
+    && apt-get install --no-install-recommends -qfy apt-transport-https software-properties-common wget gpg-agent rename git \
     && 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/' \