oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

dockerfile: Build Sodium before ZMQ for --with-libsodium for symbol decl conflicts 

Make collect script more sane, don't go backwards in directory
This commit is contained in:
Doyle 2019-10-10 11:43:08 +11:00
parent 4825c4c023
commit 951a93f1fa
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Dockerfile
View File

@ -68,6 +68,19 @@ RUN set -ex \
&& make install
ENV OPENSSL_ROOT_DIR=/usr/local/openssl-${OPENSSL_VERSION}
# Sodium
ARG SODIUM_VERSION=1.0.17
ARG SODIUM_HASH=b732443c442239c2e0184820e9b23cca0de0828c
RUN set -ex \
&& git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} --depth=1 \
&& cd libsodium \
&& test `git rev-parse HEAD` = ${SODIUM_HASH} || exit 1 \
&& ./autogen.sh \
&& ./configure \
&& make \
&& make check \
&& make install
# ZMQ
ARG ZMQ_VERSION=v4.3.1
ARG ZMQ_HASH=2cb1240db64ce1ea299e00474c646a2453a8435b
@ -76,7 +89,7 @@ RUN set -ex \
&& cd libzmq \
&& test `git rev-parse HEAD` = ${ZMQ_HASH} || exit 1 \
&& ./autogen.sh \
&& ./configure --enable-static --disable-shared \
&& ./configure --with-libsodium --enable-static --disable-shared \
&& make \
&& make install \
&& ldconfig
@ -102,19 +115,6 @@ RUN set -ex \
# && make \
# && make install
# Sodium
ARG SODIUM_VERSION=1.0.17
ARG SODIUM_HASH=b732443c442239c2e0184820e9b23cca0de0828c
RUN set -ex \
&& git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} --depth=1 \
&& cd libsodium \
&& test `git rev-parse HEAD` = ${SODIUM_HASH} || exit 1 \
&& ./autogen.sh \
&& ./configure \
&& make \
&& make check \
&& make install
# Udev
ARG UDEV_VERSION=v3.2.7
ARG UDEV_HASH=4758e346a14126fc3a964de5831e411c27ebe487

4
utils/build_scripts/collect_from_docker_container.sh
View File

@ -1,4 +1,4 @@
set -ex && mkdir -p ../../build/release/bin
set -ex && mkdir -p build/release/bin
set -ex && docker create --name loki-daemon-container loki-daemon-image
set -ex && docker cp loki-daemon-container:/usr/local/bin/ ../../build/
set -ex && docker cp loki-daemon-container:/usr/local/bin/ build/release/
set -ex && docker rm loki-daemon-container