summaryrefslogtreecommitdiff
path: root/other
diff options
context:
space:
mode:
authorMaxim Biro <nurupo.contributions@gmail.com>2018-09-26 23:34:27 -0400
committerMaxim Biro <nurupo.contributions@gmail.com>2018-10-17 14:45:44 -0400
commitb6dde3c76ff5382b0dc1caf7323b82e2f9611838 (patch)
tree04bd0c74b9a2c466b09976b0a2feeadee0b1dd98 /other
parent9b98ac1342c93babaad5968c339652ec711fbf77 (diff)
Use cmake to build toxcore in tox-boostrapd's Dockerfile
Diffstat (limited to 'other')
-rw-r--r--other/bootstrap_daemon/docker/Dockerfile25
1 files changed, 15 insertions, 10 deletions
diff --git a/other/bootstrap_daemon/docker/Dockerfile b/other/bootstrap_daemon/docker/Dockerfile
index 06bf66eb..b056773e 100644
--- a/other/bootstrap_daemon/docker/Dockerfile
+++ b/other/bootstrap_daemon/docker/Dockerfile
@@ -4,14 +4,10 @@ WORKDIR /tmp/tox
4 4
5RUN export BUILD_PACKAGES="\ 5RUN export BUILD_PACKAGES="\
6 build-essential \ 6 build-essential \
7 libtool \ 7 cmake \
8 autotools-dev \
9 automake \
10 checkinstall \
11 git \ 8 git \
12 yasm \
13 libsodium-dev \
14 libconfig-dev \ 9 libconfig-dev \
10 libsodium-dev \
15 python3" && \ 11 python3" && \
16 export RUNTIME_PACKAGES="\ 12 export RUNTIME_PACKAGES="\
17 libconfig9 \ 13 libconfig9 \
@@ -22,12 +18,21 @@ RUN export BUILD_PACKAGES="\
22 git clone https://github.com/TokTok/c-toxcore && \ 18 git clone https://github.com/TokTok/c-toxcore && \
23 cd c-toxcore && \ 19 cd c-toxcore && \
24 # checkout latest release version 20 # checkout latest release version
25 git checkout $(git tag --list | grep -P '^v(\d+).(\d+).(\d+)$' | sed "s/v/v /g" | sed "s/\./ /g" | sort -snk4,4 | sort -snk3,3 | sort -snk2,2 | tail -n 1 | sed 's/v /v/g' | sed 's/ /\./g') && \ 21 git checkout $(git tag --list | grep -P '^v(\d+).(\d+).(\d+)$' | \
26 ./autogen.sh && \ 22 sed "s/v/v /g" | sed "s/\./ /g" | \
27 ./configure --enable-daemon && \ 23 sort -snk4,4 | sort -snk3,3 | sort -snk2,2 | tail -n 1 | \
24 sed 's/v /v/g' | sed 's/ /\./g') && \
25 mkdir _build && \
26 cd _build && \
27 cmake .. \
28 -DCMAKE_BUILD_TYPE=Release \
29 -DENABLE_SHARED=ON \
30 -DENABLE_STATIC=OFF \
31 -DBUILD_TOXAV=OFF \
32 -DBOOTSTRAP_DAEMON=ON && \
28 make -j`nproc` && \ 33 make -j`nproc` && \
29 make install -j`nproc` && \ 34 make install -j`nproc` && \
30 ldconfig && \ 35 cd .. && \
31# add new user 36# add new user
32 useradd --home-dir /var/lib/tox-bootstrapd --create-home \ 37 useradd --home-dir /var/lib/tox-bootstrapd --create-home \
33 --system --shell /sbin/nologin \ 38 --system --shell /sbin/nologin \