|
@@ -2,8 +2,8 @@ FROM ubuntu:18.04
|
|
|
|
|
|
COPY ./ ./
|
|
COPY ./ ./
|
|
|
|
|
|
-RUN apt update -yqq && \
|
|
|
|
- apt install -yqq software-properties-common build-essential curl locales wget unzip git \
|
|
|
|
|
|
+RUN apt-get update -yqq && \
|
|
|
|
+ apt-get install -yqq software-properties-common build-essential curl locales wget unzip git \
|
|
libmysqlclient-dev libpq-dev \
|
|
libmysqlclient-dev libpq-dev \
|
|
libpcre3 libpcre3-dev \
|
|
libpcre3 libpcre3-dev \
|
|
libssl-dev libcurl4-openssl-dev \
|
|
libssl-dev libcurl4-openssl-dev \
|
|
@@ -17,8 +17,8 @@ RUN apt update -yqq && \
|
|
re2c libnuma-dev \
|
|
re2c libnuma-dev \
|
|
postgresql-server-dev-all libcap2-bin && \
|
|
postgresql-server-dev-all libcap2-bin && \
|
|
add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
|
|
add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
|
|
- apt update -yqq && \
|
|
|
|
- apt install -yqq gcc-8 g++-8
|
|
|
|
|
|
+ apt-get update -yqq && \
|
|
|
|
+ apt-get install -yqq gcc-8 g++-8
|
|
|
|
|
|
RUN locale-gen en_US.UTF-8
|
|
RUN locale-gen en_US.UTF-8
|
|
|
|
|
|
@@ -38,14 +38,14 @@ ENV ULIB_DOCUMENT_ROOT=$ULIB_ROOT/ULIB_DOCUMENT_ROOT
|
|
|
|
|
|
WORKDIR $IROOT
|
|
WORKDIR $IROOT
|
|
|
|
|
|
-RUN mkdir -p $ULIB_DOCUMENT_ROOT
|
|
|
|
|
|
+RUN mkdir -p $ULIB_DOCUMENT_ROOT
|
|
RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
|
|
RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
|
|
RUN tar xf ULib-${ULIB_VERSION}.tar.gz
|
|
RUN tar xf ULib-${ULIB_VERSION}.tar.gz
|
|
|
|
|
|
WORKDIR $IROOT/ULib-$ULIB_VERSION
|
|
WORKDIR $IROOT/ULib-$ULIB_VERSION
|
|
|
|
|
|
# AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
|
|
# AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
|
|
-RUN cp /src/* src/ulib/net/server/plugin/usp
|
|
|
|
|
|
+RUN cp /src/* src/ulib/net/server/plugin/usp
|
|
RUN find . -exec touch {} \;
|
|
RUN find . -exec touch {} \;
|
|
|
|
|
|
RUN echo "userver {" >> $ULIB_ROOT/benchmark.cfg
|
|
RUN echo "userver {" >> $ULIB_ROOT/benchmark.cfg
|