Merge branch 'king-11/reap-zombie' into 'main'

docker images: clean kill using tini

See merge request lightning-signer/vls-container!28
This commit is contained in:
dev random 2024-05-28 22:51:48 +00:00
commit 625a72bab1
4 changed files with 12 additions and 8 deletions

View File

@ -103,7 +103,8 @@ RUN apk --no-cache add \
boost-thread \ boost-thread \
sqlite-dev \ sqlite-dev \
libevent \ libevent \
libzmq libzmq \
tini
ARG BITCOIN_VERSION ARG BITCOIN_VERSION
ARG BITCOIN_PREFIX=/opt/bitcoin-${BITCOIN_VERSION} ARG BITCOIN_PREFIX=/opt/bitcoin-${BITCOIN_VERSION}
@ -129,7 +130,7 @@ VOLUME ["${BITCOIN_DATA}"]
USER bitcoin USER bitcoin
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/sbin/tini", "--", "/entrypoint.sh"]
RUN bitcoind -version | grep "Bitcoin Core version v${BITCOIN_VERSION}" RUN bitcoind -version | grep "Bitcoin Core version v${BITCOIN_VERSION}"

View File

@ -113,7 +113,8 @@ RUN apk update && \
bind-tools \ bind-tools \
libev-dev \ libev-dev \
curl-dev \ curl-dev \
sqlite-dev sqlite-dev \
tini
ARG LIGHTNINGD_UID=101 \ ARG LIGHTNINGD_UID=101 \
LIGHTNINGD_USER=lightning LIGHTNINGD_USER=lightning
@ -164,5 +165,5 @@ RUN pip3 install \
HEALTHCHECK --interval=5s --timeout=10s --start-period=5s \ HEALTHCHECK --interval=5s --timeout=10s --start-period=5s \
CMD ["/healthcheck.sh"] CMD ["/healthcheck.sh"]
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/sbin/tini", "--", "/entrypoint.sh"]
CMD ["lightningd"] CMD ["lightningd"]

View File

@ -32,7 +32,8 @@ RUN apk update && \
libev-dev \ libev-dev \
curl-dev \ curl-dev \
curl \ curl \
jq jq \
tini
COPY --from=builder /usr/local/bin/txood /usr/bin/txood COPY --from=builder /usr/local/bin/txood /usr/bin/txood
@ -47,5 +48,5 @@ VOLUME ["${TXOO_DATA}"]
HEALTHCHECK --interval=5s --timeout=10s --start-period=5s \ HEALTHCHECK --interval=5s --timeout=10s --start-period=5s \
CMD ["/healthcheck.sh"] CMD ["/healthcheck.sh"]
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/sbin/tini", "--", "/entrypoint.sh"]
CMD ["txood"] CMD ["txood"]

View File

@ -38,7 +38,8 @@ RUN apk update && \
build-base \ build-base \
curl-dev \ curl-dev \
protobuf \ protobuf \
bind-tools bind-tools \
tini
COPY --from=builder /usr/local/bin/vlsd2 /usr/local/bin/vlsd2 COPY --from=builder /usr/local/bin/vlsd2 /usr/local/bin/vlsd2
COPY --from=builder /usr/local/bin/vls-cli /usr/local/bin/vls-cli COPY --from=builder /usr/local/bin/vls-cli /usr/local/bin/vls-cli
@ -65,7 +66,7 @@ USER vls
HEALTHCHECK --interval=10s --timeout=10s --start-period=10s \ HEALTHCHECK --interval=10s --timeout=10s --start-period=10s \
CMD ["/healthcheck.sh"] CMD ["/healthcheck.sh"]
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/sbin/tini", "--", "/entrypoint.sh"]
RUN vlsd2 --git-desc RUN vlsd2 --git-desc