Skip to content

Commit c2b2142

Browse files
gorshunovrnurupo
authored andcommitted
Changes from @nurupo for build and runtime dependencies that reduce image size
Also removal of example bootstrap nodes from the config file in one line
1 parent 739975d commit c2b2142

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

other/bootstrap_daemon/docker/Dockerfile

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ RUN export BUILD_PACKAGES="\
1212
git \
1313
yasm \
1414
libsodium-dev \
15+
libconfig-dev \
1516
python3" && \
1617
export RUNTIME_PACKAGES="\
17-
libconfig-dev \
18+
libconfig9 \
1819
libsodium13" && \
1920
# get all deps
2021
apt-get update && apt-get install -y $BUILD_PACKAGES $RUNTIME_PACKAGES && \
@@ -34,23 +35,18 @@ RUN export BUILD_PACKAGES="\
3435
chmod 700 /var/lib/tox-bootstrapd && \
3536
cp other/bootstrap_daemon/tox-bootstrapd.conf /etc/tox-bootstrapd.conf && \
3637
# remove all the example bootstrap nodes from the config file
37-
N=-1 && \
38-
while grep -q "bootstrap_nodes =" /etc/tox-bootstrapd.conf; \
39-
do \
40-
head -n $N other/bootstrap_daemon/tox-bootstrapd.conf > /etc/tox-bootstrapd.conf; \
41-
N=$((N-1)); \
42-
done && \
38+
sed -i '/^bootstrap_nodes = /,$d' /etc/tox-bootstrapd.conf && \
4339
# add bootstrap nodes from https://nodes.tox.chat/
4440
python3 other/bootstrap_daemon/docker/get-nodes.py >> /etc/tox-bootstrapd.conf && \
41+
# perform cleanup
4542
export AUTO_ADDED_PACKAGES="$(apt-mark showauto)" && \
4643
apt-get remove --purge -y $BUILD_PACKAGES $AUTO_ADDED_PACKAGES && \
47-
apt-get install -y $RUNTIME_PACKAGES && \
4844
apt-get clean && \
4945
rm -rf /var/lib/apt/lists/* && \
5046
cd / && \
5147
rm -rf /tmp/*
5248

53-
WORKDIR /
49+
WORKDIR /var/lib/tox-bootstrapd
5450

5551
USER tox-bootstrapd
5652

@@ -59,5 +55,4 @@ ENTRYPOINT /usr/local/bin/tox-bootstrapd \
5955
--log-backend stdout \
6056
--foreground
6157

62-
EXPOSE 443 3389 33445
63-
EXPOSE 33445/udp
58+
EXPOSE 443/tcp 3389/tcp 33445/tcp 33445/udp

0 commit comments

Comments
 (0)