revert wine layers back for master

docker/bionic-wine.docker

@@ -15,18 +15,23 @@ WORKDIR $HOME/PyBitmessage
 ENV PATH $HOME/.local/bin:$PATH
 RUN ln -s src pybitmessage
 
-RUN pip install ntlm-auth
+# 64b
+RUN xvfb-run --auto-servernum --server-num=1 buildscripts/winbuild.sh
+ENV WINEPREFIX $HOME/.wine64
+ENV WINEARCH=win64
+RUN xvfb-run --auto-servernum --server-num=1 wine msiexec -i $HOME/Downloads/VCForPython27.msi /q /norestart
+RUN xvfb-run --auto-servernum --server-num=1 winetricks -q dotnet40
+RUN xvfb-run --auto-servernum --server-num=1 wine pip install wheel
+RUN xvfb-run --auto-servernum --server-num=1  wine python setup.py test
 
 # 32b
-RUN xvfb-run --auto-servernum --server-num=1 i386 buildscripts/winbuild.sh
+RUN xvfb-run --auto-servernum --server-num=2 i386 buildscripts/winbuild.sh
 ENV WINEPREFIX $HOME/.wine32
-ENV WINEARCH=win32
-RUN xvfb-run --auto-servernum --server-num=1 i386 wine msiexec -i $HOME/Downloads/VCForPython27.msi /q /norestart
-RUN xvfb-run --auto-servernum --server-num=1 i386 winetricks -q dotnet40
-RUN xvfb-run --auto-servernum --server-num=1 i386 wine pip install wheel
-RUN xvfb-run --auto-servernum --server-num=1 i386 wine python setup.py test
-
-
+ENV WINEARCH=wine32
+RUN xvfb-run --auto-servernum --server-num=3 i386 wine msiexec -i $HOME/Downloads/VCForPython27.msi /q /norestart
+RUN xvfb-run --auto-servernum --server-num=4 i386 winetricks -q dotnet40
+RUN xvfb-run --auto-servernum --server-num=5 i386 wine pip install wheel
+RUN xvfb-run --auto-servernum --server-num=6 i386 wine python setup.py test