This commit is contained in:
Pete Fisher committed 2021-03-18 14:34:40 +00:00
1 parent 588a157d18
commit 7258a028d7
1 file changed
+10 -8
+10 -8
View File
@@ -79,7 +79,6 @@ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
mono-reference-assemblies-4.0 \
bash-completion \
libpq-dev \
libiml-dev \
libpqxx-dev \
zip \
parallel \
@@ -104,7 +103,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y ccache
run pip install pybars3 paramiko mkdocs
run pip3 install paramiko
run pip3 install paramiko cryptography
run npm install -g npx
# fix locale so we can run tmux
@@ -213,15 +212,18 @@ RUN \
libpcap0.8-dev \
libtool-bin \
&& cd /tmp \
&& curl -fSL https://www.openonload.org/download/openonload-${ONLOAD_VERSION}.tgz -o /tmp/openonload-${ONLOAD_VERSION}.tgz \
&& echo "${ONLOAD_MD5SUM} openonload-${ONLOAD_VERSION}.tgz" | md5sum --check \
&& tar -zxf openonload-${ONLOAD_VERSION}.tgz \
&& cd /tmp/openonload-${ONLOAD_VERSION} \
## && curl -fSL https://www.openonload.org/download/openonload-${ONLOAD_VERSION}.tgz -o /tmp/openonload-${ONLOAD_VERSION}.tgz \
&& curl -fSL https://github.com/rigtorp/openonload/archive/master.zip -o /tmp/openonload-${ONLOAD_VERSION}.zip \
## && echo "${ONLOAD_MD5SUM} openonload-${ONLOAD_VERSION}.tgz" | md5sum --check \
## && tar -zxf openonload-${ONLOAD_VERSION}.tgz \
&& unzip -a openonload-${ONLOAD_VERSION}.zip \
## && cd /tmp/openonload-${ONLOAD_VERSION} \
&& cd /tmp/openonload-master \
&& cd scripts \
&& ./onload_build --user \
&& ./onload_install --userfiles --nobuild \
&& cd /tmp \
&& rm -rf openonload-${ONLOAD_VERSION}.tgz openonload-${ONLOAD_VERSION} \
&& rm -rf openonload* \
&& if [ -z ${ONLOAD_WITHZF} ] ; then rm -rf /usr/include/zf /usr/bin/zf_stackdump /usr/bin/zf_debug /usr/lib/x86_64-linux-gnu/zf /usr/lib/x86_64-linux-gnu/libonload_zf* ; fi \
&& DEBIAN_FRONTEND=noninteractive apt-get remove -y --purge \
curl \
@@ -248,4 +250,4 @@ cd cgdb && \
git checkout v0.7.1 && \
./autogen.sh && \
./configure && make -j$(nproc) && \
make install
make install