diff --git a/lbry/scripts/docker_pyinstaller/Dockerfile b/lbry/scripts/docker_pyinstaller/Dockerfile deleted file mode 100644 index e79d72249..000000000 --- a/lbry/scripts/docker_pyinstaller/Dockerfile +++ /dev/null @@ -1,87 +0,0 @@ -FROM 32bit/ubuntu:16.04 - -ENV DEBIAN_FRONTEND noninteractive - -#ARG WINE_VERSION=winehq-staging -COPY wine_3.20.1-1_i386.deb /wine_3.20.1-1_i386.deb - -ARG PYTHON_VERSION=3.7.1 -ARG PYINSTALLER_VERSION=3.4 - -# we need wine for this all to work, so we'll use the PPA -RUN set -x \ -## && dpkg --add-architecture i386 \ - && dpkg -i /wine_3.20.1-1_i386.deb \ - && 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/Release.key \ - && apt-key add Release.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 install --no-install-recommends -qfy 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 win32 -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/win32/${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_SYSTEM_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/11687613/88b50ce70017bf10f2d56d60fcba6ab1/VC_redist.x86.exe \ - && cabextract -q --directory="$W_TMP" "$W_TMP"/VC_redist.x86.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_SYSTEM_DLLS"/ - -# 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 - -RUN pip install pyinstaller==$PYINSTALLER_VERSION - -COPY entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/lbry/scripts/docker_pyinstaller/README.md b/lbry/scripts/docker_pyinstaller/README.md deleted file mode 100644 index 2e8bb3553..000000000 --- a/lbry/scripts/docker_pyinstaller/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# PyInstaller docker image fork used on build process - -This is a temporary fork of [docker-pyinstaller](https://github.com/cdrx/docker-pyinstaller/tree/master/win32/py3) that uses [zzhiyi's fork of wine](https://github.com/zzhiyi/wine/tree/kernelbase/PathCchCanonicalizeEx) to build with Python 3.7.1 and PyInstaller 3.4. -Once those changes settles both in wine and docker-pyinstaller repo, this folder should be removed. - -## But hey, where is `wine_3.20.1-1_i386.deb` and how was it generated? -It's a package generated out of above mentioned wine branch. You can find instructions on how to generate Debian packages on the [Wine Wiki](https://wiki.winehq.org/Building_Biarch_Wine_On_Ubuntu) or use a helper like [docker-wine-builder](https://github.com/shyba/docker-wine-builder). diff --git a/lbry/scripts/docker_pyinstaller/entrypoint.sh b/lbry/scripts/docker_pyinstaller/entrypoint.sh deleted file mode 100644 index d12a3539a..000000000 --- a/lbry/scripts/docker_pyinstaller/entrypoint.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -# Fail on errors. -set -e - -# -# 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 /src - -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 # [[ "$@" == "" ]] diff --git a/lbry/scripts/wine_build.sh b/lbry/scripts/wine_build.sh deleted file mode 100755 index b3fa4712d..000000000 --- a/lbry/scripts/wine_build.sh +++ /dev/null @@ -1,22 +0,0 @@ -set -x -rm -rf /tmp/.wine-* - -apt-get -qq update -apt-get -qq install -y git - -pip install setuptools_scm - -# Download from their CI until its not released. Remove later! -wget -Onetifaces-0.10.7-cp37-cp37m-win32.whl https://ci.appveyor.com/api/buildjobs/6hworunifsymrhp2/artifacts/dist%2Fnetifaces-0.10.7-cp37-cp37m-win32.whl -pip install netifaces-0.10.7-cp37-cp37m-win32.whl - -cd lbry -cd torba -pip install . -cd .. -cd lbry -pip install -e . -pip install pywin32 - -pyinstaller --additional-hooks-dir=scripts/. --icon=icons/lbry256.ico -F -n lbrynet lbry/extras/cli.py -wine dist/lbrynet.exe --version