From 1ddd45d8a7dc9a7f33399157b69eb40115cfa29e Mon Sep 17 00:00:00 2001 From: Michael Sproul Date: Fri, 15 Jul 2022 16:10:34 +1000 Subject: [PATCH] Add Lighthouse version info --- clients/lighthouse-bn/Dockerfile | 6 ++++-- clients/lighthouse-bn/lighthouse_version.sh | 6 ++++++ clients/lighthouse-vc/Dockerfile | 6 ++++-- clients/lighthouse-vc/lighthouse_version.sh | 6 ++++++ 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 clients/lighthouse-bn/lighthouse_version.sh create mode 100755 clients/lighthouse-vc/lighthouse_version.sh diff --git a/clients/lighthouse-bn/Dockerfile b/clients/lighthouse-bn/Dockerfile index 0280321ab6..c31c270b93 100644 --- a/clients/lighthouse-bn/Dockerfile +++ b/clients/lighthouse-bn/Dockerfile @@ -5,7 +5,9 @@ FROM sigp/lighthouse:$branch ADD lighthouse_bn.sh /lighthouse_bn.sh RUN chmod +x /lighthouse_bn.sh -# TODO: output accurate client version -RUN echo "latest" > /version.txt +ADD lighthouse_version.sh /lighthouse_version.sh +RUN chmod +x /lighthouse_version.sh + +RUN /lighthouse_version.sh > /version.txt ENTRYPOINT ["/lighthouse_bn.sh"] diff --git a/clients/lighthouse-bn/lighthouse_version.sh b/clients/lighthouse-bn/lighthouse_version.sh new file mode 100644 index 0000000000..804b5a0ca8 --- /dev/null +++ b/clients/lighthouse-bn/lighthouse_version.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Immediately abort the script on any error encountered +set -e + +lighthouse --version | head -1 | sed "s/ /\//g" diff --git a/clients/lighthouse-vc/Dockerfile b/clients/lighthouse-vc/Dockerfile index 2273290988..f969192e3f 100644 --- a/clients/lighthouse-vc/Dockerfile +++ b/clients/lighthouse-vc/Dockerfile @@ -5,7 +5,9 @@ FROM sigp/lighthouse:$branch ADD lighthouse_vc.sh /lighthouse_vc.sh RUN chmod +x /lighthouse_vc.sh -# TODO: output accurate client version -RUN echo "latest" > /version.txt +ADD lighthouse_version.sh /lighthouse_version.sh +RUN chmod +x /lighthouse_version.sh + +RUN /lighthouse_version.sh > /version.txt ENTRYPOINT ["/lighthouse_vc.sh"] diff --git a/clients/lighthouse-vc/lighthouse_version.sh b/clients/lighthouse-vc/lighthouse_version.sh new file mode 100755 index 0000000000..804b5a0ca8 --- /dev/null +++ b/clients/lighthouse-vc/lighthouse_version.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Immediately abort the script on any error encountered +set -e + +lighthouse --version | head -1 | sed "s/ /\//g"