Merge branch 'qa_gpos_18.04_gcc7_fix' into develop

This commit is contained in:
Srdjan Obucina 2019-08-28 17:05:24 +02:00
commit 1a6ba1ac1e

View file

@ -23,8 +23,8 @@ RUN \
libssl-dev \ libssl-dev \
libtool \ libtool \
locales \ locales \
pkg-config \
ntp \ ntp \
pkg-config \
wget \ wget \
&& \ && \
apt-get clean && \ apt-get clean && \
@ -34,9 +34,6 @@ RUN \
sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
locale-gen locale-gen
ADD . /peerplays-core
WORKDIR /peerplays-core
# Compile Boost # Compile Boost
RUN \ RUN \
BOOST_ROOT=$HOME/boost_1_67_0 && \ BOOST_ROOT=$HOME/boost_1_67_0 && \
@ -47,6 +44,9 @@ RUN \
./b2 install && \ ./b2 install && \
cd .. cd ..
ADD . /peerplays-core
WORKDIR /peerplays-core
# Compile Peerplays # Compile Peerplays
RUN \ RUN \
BOOST_ROOT=$HOME/boost_1_67_0 && \ BOOST_ROOT=$HOME/boost_1_67_0 && \