update build layers and add sh for multiple run
This commit is contained in:
parent
774f646bf7
commit
c7a2c910c8
|
@ -49,9 +49,9 @@ RUN useradd -ms /bin/bash pool
|
|||
RUN echo 'pool ALL=ALL NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
|
||||
# Travis start
|
||||
## pybm-travis
|
||||
|
||||
FROM pybm-build as pybm-travis
|
||||
FROM pybm-build
|
||||
|
||||
RUN pip install --upgrade setuptools
|
||||
|
||||
|
@ -61,9 +61,7 @@ WORKDIR $HOME
|
|||
|
||||
RUN git clone https://github.com/Bitmessage/PyBitmessage
|
||||
|
||||
RUN apt-get install python-prctl
|
||||
|
||||
RUN apt-get -y install g++
|
||||
RUN apt-get -y install python-prctl g++
|
||||
|
||||
WORKDIR $HOME/PyBitmessage
|
||||
ENV PATH $HOME/.local/bin:$PATH
|
||||
|
|
20
build.sh
20
build.sh
|
@ -1,11 +1,17 @@
|
|||
#!/bin/sh
|
||||
echo Building pybm-build
|
||||
echo Building pybm-build 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-build build
|
||||
sudo docker build -t pybm-build -f docker/bionic-buildenv.docker .
|
||||
|
||||
# pybm-travis build
|
||||
docker build -t pybm-travis -f bionic-travis.docker .
|
||||
## pybm-travis build
|
||||
echo Building pybm-travis build
|
||||
|
||||
# pybm-wine build
|
||||
docker build -t pybm-wine -f bionic-wine.docker .
|
||||
sudo docker build -t pybm-travis -f docker/bionic-travis.docker .
|
||||
|
||||
## pybm-travis build
|
||||
echo Building pybm-travis container
|
||||
|
||||
sudo docker run pybm-travis
|
||||
## pybm-wine build
|
||||
#docker build -t pybm-wine -f bionic-wine.docker .
|
||||
|
|
|
@ -6,13 +6,15 @@ RUN dpkg --add-architecture i386
|
|||
|
||||
RUN apt-get update
|
||||
|
||||
RUN apt-get -y install sudo
|
||||
|
||||
# travis xenial bionic
|
||||
RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||
python-setuptools libssl-dev python-dev python-virtualenv python-pip
|
||||
python-setuptools libssl-dev libpq-dev python-prctl python-dev python-dev python-virtualenv python-pip
|
||||
|
||||
# travis focal
|
||||
RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||
python-setuptools libssl-dev python-dev python3-virtualenv python3-pip
|
||||
python-setuptools libpcap-dev libpq-dev python-prctl python-dev libpcap-dev python3-virtualenv python3-pip
|
||||
|
||||
# dpkg
|
||||
RUN apt-get install -yq --no-install-suggests --no-install-recommends \
|
||||
|
@ -45,4 +47,3 @@ RUN chmod a+x /usr/local/bin/travis2bash.sh
|
|||
RUN useradd -ms /bin/bash pool
|
||||
|
||||
RUN echo 'pool ALL=ALL NOPASSWD:ALL' >> /etc/sudoers
|
||||
|
||||
|
|
|
@ -1,10 +1,15 @@
|
|||
FROM pybm-build
|
||||
|
||||
USER pool
|
||||
RUN pip install --upgrade setuptools
|
||||
|
||||
ENV HOME /root
|
||||
|
||||
WORKDIR $HOME
|
||||
|
||||
RUN git clone https://github.com/Bitmessage/PyBitmessage
|
||||
|
||||
RUN apt-get -y install python-prctl g++
|
||||
|
||||
WORKDIR $HOME/PyBitmessage
|
||||
ENV PATH $HOME/.local/bin:$PATH
|
||||
|
||||
|
|
|
@ -15,23 +15,18 @@ WORKDIR $HOME/PyBitmessage
|
|||
ENV PATH $HOME/.local/bin:$PATH
|
||||
RUN ln -s src pybitmessage
|
||||
|
||||
# 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
|
||||
RUN pip install ntlm-auth
|
||||
|
||||
# 32b
|
||||
RUN xvfb-run --auto-servernum --server-num=2 i386 buildscripts/winbuild.sh
|
||||
RUN xvfb-run --auto-servernum --server-num=1 i386 buildscripts/winbuild.sh
|
||||
ENV WINEPREFIX $HOME/.wine32
|
||||
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
|
||||
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
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user