diff --git a/docker/DockerfileAlpine b/docker/DockerfileAlpine index 5eb011cf..360a73ba 100644 --- a/docker/DockerfileAlpine +++ b/docker/DockerfileAlpine @@ -9,14 +9,14 @@ ENV DESTDIR=/install RUN cd opendht && mkdir build && cd build \ && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \ - -DOPENDHT_C=On \ - -DOPENDHT_PEER_DISCOVERY=On \ - -DOPENDHT_PYTHON=On \ - -DOPENDHT_TOOLS=On \ - -DOPENDHT_PROXY_SERVER=On \ - -DOPENDHT_PROXY_CLIENT=On \ - -DOPENDHT_SYSTEMD=On \ + -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \ + -DOPENDHT_C=On \ + -DOPENDHT_PEER_DISCOVERY=On \ + -DOPENDHT_PYTHON=On \ + -DOPENDHT_TOOLS=On \ + -DOPENDHT_PROXY_SERVER=On \ + -DOPENDHT_PROXY_CLIENT=On \ + -DOPENDHT_SYSTEMD=On \ && make -j8 && make install FROM alpine:3.23 AS install diff --git a/docker/DockerfileAlpineEdge b/docker/DockerfileAlpineEdge index 4b35da23..9ab3b2fd 100644 --- a/docker/DockerfileAlpineEdge +++ b/docker/DockerfileAlpineEdge @@ -8,7 +8,7 @@ RUN mkdir /install ENV DESTDIR=/install RUN cd opendht && mkdir build && cd build \ - && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ + && cmake .. -GNinja -DCMAKE_INSTALL_PREFIX=/usr \ -DOPENDHT_DOWNLOAD_DEPS=Off \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=On \ @@ -19,7 +19,7 @@ RUN cd opendht && mkdir build && cd build \ -DOPENDHT_PROXY_SERVER=On \ -DOPENDHT_PROXY_CLIENT=On \ -DOPENDHT_SYSTEMD=On \ - && make -j8 && make install + && ninja && ninja install FROM alpine:edge AS install COPY --from=build /install / @@ -32,10 +32,9 @@ RUN apk add --no-cache \ jsoncpp \ llhttp \ fmt \ + simdutf \ readline \ - ncurses \ - gdb -#CMD ["dhtnode", "-b", "bootstrap.jami.net", "-p", "4222", "--proxyserver", "8080"] + ncurses +CMD ["dhtnode", "-b", "bootstrap.jami.net", "-p", "4222", "--proxyserver", "8080"] EXPOSE 4222/udp EXPOSE 8080/tcp -CMD ["/bin/sh"] diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps index 66fb63d2..6d5519e7 100644 --- a/docker/DockerfileDeps +++ b/docker/DockerfileDeps @@ -22,9 +22,9 @@ RUN mkdir /usr/include/nonstd \ RUN echo "*** Downloading RESTinio ***" \ && mkdir restinio && cd restinio \ - && wget https://github.com/Stiffstream/restinio/releases/download/v.0.7.3/restinio-0.7.3.tar.bz2 \ - && ls -l && tar -xjf restinio-0.7.3.tar.bz2 \ - && cd restinio-0.7.3/dev \ + && wget https://github.com/Stiffstream/restinio/releases/download/v0.7.8.1/restinio-0.7.8.1.tar.bz2 \ + && ls -l && tar -xjf restinio-0.7.8.1.tar.bz2 \ + && cd restinio-0.7.8.1/dev \ && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=Off -DRESTINIO_SAMPLE=Off -DRESTINIO_BENCHMARK=Off \ -DRESTINIO_WITH_SOBJECTIZER=Off -DRESTINIO_DEP_STANDALONE_ASIO=system -DRESTINIO_DEP_LLHTTP=system \ -DRESTINIO_DEP_FMT=system -DRESTINIO_DEP_EXPECTED_LITE=system . \ diff --git a/docker/DockerfileDepsAlpine b/docker/DockerfileDepsAlpine index 0f07608f..93ad5eab 100644 --- a/docker/DockerfileDepsAlpine +++ b/docker/DockerfileDepsAlpine @@ -17,9 +17,9 @@ RUN mkdir /usr/include/nonstd \ RUN echo "*** Downloading RESTinio ***" \ && mkdir restinio && cd restinio \ - && wget https://github.com/Stiffstream/restinio/releases/download/v.0.7.3/restinio-0.7.3.tar.bz2 \ - && ls -l && tar -xjf restinio-0.7.3.tar.bz2 \ - && cd restinio-0.7.3/dev \ + && wget https://github.com/Stiffstream/restinio/releases/download/v0.7.8.1/restinio-0.7.8.1.tar.bz2 \ + && ls -l && tar -xjf restinio-0.7.8.1.tar.bz2 \ + && cd restinio-0.7.8.1/dev \ && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=Off -DRESTINIO_SAMPLE=Off -DRESTINIO_BENCHMARK=Off \ -DRESTINIO_WITH_SOBJECTIZER=Off -DRESTINIO_DEP_STANDALONE_ASIO=system -DRESTINIO_DEP_LLHTTP=system \ -DRESTINIO_DEP_FMT=system -DRESTINIO_DEP_EXPECTED_LITE=system . \ diff --git a/docker/DockerfileDepsAlpineEdge b/docker/DockerfileDepsAlpineEdge index 5c1b718c..f23627ba 100644 --- a/docker/DockerfileDepsAlpineEdge +++ b/docker/DockerfileDepsAlpineEdge @@ -7,7 +7,7 @@ RUN apk add --no-cache \ cython python3-dev py3-setuptools \ ncurses-dev readline-dev nettle-dev \ cppunit-dev gnutls-dev jsoncpp-dev \ - argon2-dev openssl-dev fmt-dev \ + argon2-dev openssl-dev fmt-dev simdutf-dev \ llhttp-dev asio-dev msgpack-cxx-dev \ && rm -rf /var/cache/apk/* @@ -17,11 +17,11 @@ RUN mkdir /usr/include/nonstd \ RUN echo "*** Downloading RESTinio ***" \ && mkdir restinio && cd restinio \ - && wget https://github.com/Stiffstream/restinio/releases/download/v.0.7.3/restinio-0.7.3.tar.bz2 \ - && ls -l && tar -xjf restinio-0.7.3.tar.bz2 \ - && cd restinio-0.7.3/dev \ - && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=Off -DRESTINIO_SAMPLE=Off -DRESTINIO_BENCHMARK=Off \ + && wget https://github.com/Stiffstream/restinio/releases/download/v0.7.8.1/restinio-0.7.8.1.tar.bz2 \ + && ls -l && tar -xjf restinio-0.7.8.1.tar.bz2 \ + && cd restinio-0.7.8.1/dev \ + && cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=Off -DRESTINIO_SAMPLE=Off -DRESTINIO_BENCHMARK=Off \ -DRESTINIO_WITH_SOBJECTIZER=Off -DRESTINIO_DEP_STANDALONE_ASIO=system -DRESTINIO_DEP_LLHTTP=system \ -DRESTINIO_DEP_FMT=system -DRESTINIO_DEP_EXPECTED_LITE=system . \ - && make -j2 && make install \ + && ninja && ninja install \ && cd ../../ && rm -rf restinio* diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm index 8d490a20..983f1050 100644 --- a/docker/DockerfileDepsLlvm +++ b/docker/DockerfileDepsLlvm @@ -28,9 +28,9 @@ RUN mkdir /usr/include/nonstd \ RUN echo "*** Downloading RESTinio ***" \ && mkdir restinio && cd restinio \ - && wget https://github.com/Stiffstream/restinio/releases/download/v.0.7.3/restinio-0.7.3.tar.bz2 \ - && ls -l && tar -xjf restinio-0.7.3.tar.bz2 \ - && cd restinio-0.7.3/dev \ + && wget https://github.com/Stiffstream/restinio/releases/download/v0.7.8.1/restinio-0.7.8.1.tar.bz2 \ + && ls -l && tar -xjf restinio-0.7.8.1.tar.bz2 \ + && cd restinio-0.7.8.1/dev \ && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=Off -DRESTINIO_SAMPLE=Off -DRESTINIO_BENCHMARK=Off \ -DRESTINIO_WITH_SOBJECTIZER=Off -DRESTINIO_DEP_STANDALONE_ASIO=system -DRESTINIO_DEP_LLHTTP=system \ -DRESTINIO_DEP_FMT=system -DRESTINIO_DEP_EXPECTED_LITE=system . \