From 774f646bf77c0152083b2494cd1a880b5da3e67f Mon Sep 17 00:00:00 2001
From: Muzahid <muzahid.h@cisinlabs.com>
Date: Mon, 11 Jan 2021 20:10:48 +0530
Subject: [PATCH] resolving wine build setup with pybm-build

---
 build.sh                  | 11 +++++++++++
 docker/bionic-wine.docker | 28 ++++++++++++++++------------
 2 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 build.sh

diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..ba9dc93
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+echo Building pybm-build
+
+# pybm-build build
+docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy -t pybm-build -f bionic-buildenv.docker .
+
+# pybm-travis build
+docker build -t pybm-travis -f bionic-travis.docker .
+
+# pybm-wine build
+docker build -t pybm-wine -f bionic-wine.docker .
diff --git a/docker/bionic-wine.docker b/docker/bionic-wine.docker
index 3928476..e11fb8f 100644
--- a/docker/bionic-wine.docker
+++ b/docker/bionic-wine.docker
@@ -1,7 +1,8 @@
 FROM pybm-build
 
-USER pool
-
+RUN pip install --upgrade setuptools
+RUN pip install pycrypto
+ENV HOME /root
 
 RUN mkdir $HOME/Downloads
 WORKDIR $HOME/Downloads
@@ -15,19 +16,22 @@ ENV PATH $HOME/.local/bin:$PATH
 RUN ln -s src pybitmessage
 
 # 64b
-RUN xvfb-run buildscripts/winbuild.sh
+RUN xvfb-run --auto-servernum --server-num=1 buildscripts/winbuild.sh
 ENV WINEPREFIX $HOME/.wine64
 ENV WINEARCH=win64
-RUN xvfb-run wine msiexec -i $HOME/Downloads/VCForPython27.msi /q /norestart
-RUN xvfb-run winetricks -q dotnet40
-RUN xvfb-run wine pip install wheel
-RUN xvfb-run wine python setup.py test
+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 i386 buildscripts/winbuild.sh
+RUN xvfb-run --auto-servernum --server-num=2 i386 buildscripts/winbuild.sh
 ENV WINEPREFIX $HOME/.wine32
 ENV WINEARCH=wine32
-RUN xvfb-run i386 wine msiexec -i $HOME/Downloads/VCForPython27.msi /q /norestart
-RUN xvfb-run i386 winetricks -q dotnet40
-RUN xvfb-run i386 wine pip install wheel
-RUN xvfb-run i386 wine python setup.py test
+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
+
+
+