Skip to content

Commit 8e56190

Browse files
make heredoc blocks fail on command fail
1 parent ed22ee2 commit 8e56190

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

images/litecoind/Dockerfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
77

88
# Remove libdb++-dev after upstream fixes the problem with --disable-wallet requiring it
99
RUN <<-EOF
10+
set -e
1011
apt-get -y update && \
1112
apt-get -y install \
1213
git \
@@ -26,6 +27,7 @@ WORKDIR /opt/litecoin
2627
# https://github.com/boostorg/thread/pull/297/commits/74fb0a26099bc51d717f5f154b37231ce7df3e98
2728
# CXXFLAGS and CPPFLAGS can be removed if upstream ever updates Boost to 1.73.0 or newer
2829
RUN <<-EOF
30+
set -e
2931
make -C /opt/litecoin/depends/ -j $(getconf _NPROCESSORS_ONLN) NO_QT=1 NO_QR=1 NO_WALLET=1 NO_BDB=1 \
3032
boost_cxxflags="-std=c++11 -fvisibility=hidden -DPTHREAD_STACK_MIN=16384" \
3133
boost_cppflags="-DPTHREAD_STACK_MIN=16384"
@@ -40,21 +42,17 @@ RUN <<-EOF
4042
CPPFLAGS="-DPTHREAD_STACK_MIN=16384"
4143
make -j $(getconf _NPROCESSORS_ONLN)
4244
make install && \
43-
find /opt/litecoin/depends/x86_64-pc-linux-gnu/bin/ -type f -executable ! -name "*.*" -exec strip -s {} \;
45+
find /opt/litecoin/depends/x86_64-pc-linux-gnu/bin/ -type f -executable -exec strip -s {} + 2>/dev/null || true
4446
EOF
4547

4648
COPY litecoin.conf /opt/litecoin/.litecoin/litecoin.conf
47-
48-
RUN <<-EOF
49-
mkdir -p /opt/litecoin/.litecoin/db
50-
chown -R 65532:65532 /opt/litecoin/
51-
EOF
49+
RUN mkdir -p /opt/litecoin/.litecoin/db
5250

5351
FROM gcr.io/distroless/cc-debian12:nonroot@sha256:d1b8e4c52be1111aa108e959ef2a822299bb70fd1819dd250871a2601ca1e4b6 as final
5452

5553
ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
5654

57-
COPY --from=build /opt/litecoin/depends/x86_64-pc-linux-gnu/bin/ /opt/litecoin/bin/
58-
COPY --from=build /opt/litecoin/.litecoin/ /opt/litecoin/.litecoin/
55+
COPY --from=build --chown=65532:65532 /opt/litecoin/depends/x86_64-pc-linux-gnu/bin/ /opt/litecoin/bin/
56+
COPY --from=build --chown=65532:65532 /opt/litecoin/.litecoin/ /opt/litecoin/.litecoin/
5957

6058
ENTRYPOINT ["/opt/litecoin/bin/litecoind", "-conf=/opt/litecoin/.litecoin/litecoin.conf", "-datadir=/opt/litecoin/.litecoin/db", "-txindex=1"]

0 commit comments

Comments
 (0)