From 033b51a20327765422ad85b4ca930ef228a780e7 Mon Sep 17 00:00:00 2001
From: Fizban <jackmckew2@gmail.com>
Date: Tue, 2 Jun 2020 23:50:28 +1000
Subject: [PATCH] Change to just call docker

---
 Dockerfile    | 78 ---------------------------------------------------
 entrypoint.sh | 51 +--------------------------------
 2 files changed, 1 insertion(+), 128 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8937598..ad8635c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,83 +1,5 @@
 FROM ubuntu:16.04
 
-ENV DEBIAN_FRONTEND noninteractive
-
-ARG WINE_VERSION=winehq-staging
-ARG PYTHON_VERSION=3.7.5
-ARG PYINSTALLER_VERSION=3.6
-
-# 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 \
-    && 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:/Python37; \
-        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 \
-    && echo 'assoc .py=PythonScript' | wine cmd \
-    && echo 'ftype PythonScript=c:\Python37\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
 
diff --git a/entrypoint.sh b/entrypoint.sh
index fedab3f..4944745 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,50 +1 @@
-#!/bin/bash
-
-# Fail on errors.
-set -e
-
-# Make sure .bashrc is sourced
-. /root/.bashrc
-
-cp $1 /src/
-
-# 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
-# Provided path, or val if not set
-WORKDIR=$1
-# WORKDIR=${1:-/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 # [[ "$@" == "" ]]
-
+docker run -v "$(pwd)/$1:/src/" cdrx/pyinstaller-windows
\ No newline at end of file