From aa3c28763f67f621e78f5f2de02a456d42c90a35 Mon Sep 17 00:00:00 2001 From: Dario via Pythagoras Date: Thu, 25 Mar 2021 07:49:06 +0100 Subject: [PATCH] remove protobuf tests, shorten cpu core getter --- login_server/Dockerfile.debug | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/login_server/Dockerfile.debug b/login_server/Dockerfile.debug index 0c7c741d5..e5603bbc1 100644 --- a/login_server/Dockerfile.debug +++ b/login_server/Dockerfile.debug @@ -6,10 +6,10 @@ RUN git clone --recurse-submodules https://github.com/protocolbuffers/protobuf.g WORKDIR /protobuf RUN git checkout v3.9.1 -RUN ./autogen.sh +RUN ./autogen.sh RUN ./configure --enable-static=yes -RUN make -j$(grep processor /proc/cpuinfo | wc -l) -RUN make check +RUN make -j$(nproc) +#RUN make check CMD ["./protobuf"] @@ -43,7 +43,7 @@ RUN cd dependencies/iroha-ed25519 && \ mkdir build && \ cd build && \ cmake .. -DCMAKE_BUILD_TYPE=Debug -DEDIMPL=ref10 -DHASH=sha2_sphlib -DRANDOM=bcryptgen -DBUILD=STATIC && \ - make -j$(grep processor /proc/cpuinfo | wc -l) + make -j$(nproc) RUN cd dependencies/mariadb-connector-c && \ mkdir build && \ @@ -98,7 +98,7 @@ RUN ./compile_pot.sh RUN ./compile_proto.sh RUN cd build && \ cmake -DCMAKE_BUILD_TYPE=Debug .. && \ - make -j$(grep processor /proc/cpuinfo | wc -l) + make -j$(nproc) ######################################################################################################### @@ -129,4 +129,4 @@ EXPOSE 1201 #RUN chmod +x ./start_after_mysql.sh #ENTRYPOINT ["/usr/bin/Gradido_LoginServer"] #CMD gdb -ex=r Gradido_LoginServer -CMD Gradido_LoginServer \ No newline at end of file +CMD Gradido_LoginServer