From f012ef786899d7ee287f82bcc9baaeffb1a98f4c Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 11:28:33 +0300 Subject: [PATCH 01/11] Update main.sh --- Sentinel-dVPN-node/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sentinel-dVPN-node/main.sh b/Sentinel-dVPN-node/main.sh index 3f7e8ba7..a9dfe0cf 100644 --- a/Sentinel-dVPN-node/main.sh +++ b/Sentinel-dVPN-node/main.sh @@ -9,7 +9,7 @@ check_var() { if [[ -z ${!var_name} ]]; then echo "$error_message" echo "For example: $example" - sleep infinity + exec "$@" fi } update_config() { From 72d9d2bcdeec1cafcf07e28bb0b76da869eba3ce Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 11:29:33 +0300 Subject: [PATCH 02/11] Update Dockerfile --- Sentinel-dVPN-node/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Sentinel-dVPN-node/Dockerfile b/Sentinel-dVPN-node/Dockerfile index ff604b47..6b7a8673 100644 --- a/Sentinel-dVPN-node/Dockerfile +++ b/Sentinel-dVPN-node/Dockerfile @@ -44,4 +44,6 @@ RUN git clone https://github.com/sentinel-official/dvpn-node && \ # Copy the main script and set CMD COPY ./main.sh / RUN sed -i 's/\r//' /main.sh && chmod +x /main.sh -CMD ["/main.sh"] +ENTRYPOINT ["/tini", "--", "/main.sh"] +CMD ["tail", "-f", "/dev/null"] + From 5ef291c6b75fdfb786efd00d9bea1a409237f91b Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 11:31:02 +0300 Subject: [PATCH 03/11] Update main.sh --- bitcoin/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoin/main.sh b/bitcoin/main.sh index aff70da8..82dc8446 100644 --- a/bitcoin/main.sh +++ b/bitcoin/main.sh @@ -38,4 +38,4 @@ ln -s /root/bitcoin /etc/service ln -s /var/log/bitcoin/current /LOG echo = Установка завершена, логи ноды доступны командой [tail -f /var/log/bitcoin/current] = echo == Installation complete, node logs available with [tail -f /var/log/bitcoin/current] = -sleep infinity +exec "$@" From f14492f47ef2577a6df1d7d16b395a7b3b2f9b73 Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 11:33:08 +0300 Subject: [PATCH 04/11] Update entrypoint.sh --- cryptodredge-c11/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptodredge-c11/entrypoint.sh b/cryptodredge-c11/entrypoint.sh index f9404768..ff34d649 100644 --- a/cryptodredge-c11/entrypoint.sh +++ b/cryptodredge-c11/entrypoint.sh @@ -15,5 +15,5 @@ OPTIONS=$(remove_quotes "$OPTIONS") export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/root -sleep infinity +exec "$@" /root/CryptoDredge -a $ALGO -o $POOL -u $WALLET_ADDRESS -p $PASSWORD $OPTIONS From 76df1cb1966eec7fed19d68bb9ae4771d17ecbce Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 11:33:46 +0300 Subject: [PATCH 05/11] Update Dockerfile --- cryptodredge-c11/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cryptodredge-c11/Dockerfile b/cryptodredge-c11/Dockerfile index a56a628f..fced1839 100644 --- a/cryptodredge-c11/Dockerfile +++ b/cryptodredge-c11/Dockerfile @@ -23,4 +23,5 @@ RUN ls -la COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh -ENTRYPOINT /entrypoint.sh +ENTRYPOINT ["/tini", "--", "/entrypoint.sh"] +CMD ["tail", "-f", "/dev/null"] From 5f5d9877e7bd8465ee2ca4c1e0ccfa2cd0d244fd Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 11:35:52 +0300 Subject: [PATCH 06/11] Update deploy.yaml --- semantra/deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/semantra/deploy.yaml b/semantra/deploy.yaml index 4657360c..0b09e202 100644 --- a/semantra/deploy.yaml +++ b/semantra/deploy.yaml @@ -21,7 +21,7 @@ services: wget https://github.com/freedmand/semantra/raw/main/docs/example_docs/us_inaugural_speeches.zip; unzip * ; /root/.local/bin/semantra --transformer-model Muennighoff/SGPT-1.3B-weightedmean-msmarco-specb-bitfit us_inaugural_speeches/*; - sleep infinity ;' + tail -f /dev/null ;' # your files can be in txt or pdf # installation may take a while since models are large @@ -65,4 +65,4 @@ deployment: app: akash: profile: app - count: 1 \ No newline at end of file + count: 1 From f47a2997c1c2792b3a53c0483134eae1e68c5183 Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 11:36:08 +0300 Subject: [PATCH 07/11] Update deploy.yaml --- semantra/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semantra/deploy.yaml b/semantra/deploy.yaml index 0b09e202..0fdfdc20 100644 --- a/semantra/deploy.yaml +++ b/semantra/deploy.yaml @@ -3,7 +3,7 @@ version: "2.0" services: app: - image: ubuntu:latest + image: ubuntu:22.04 command: - "bash" From 15035d8002ba130f7ad7e3f90f822b5d34fd2478 Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 11:36:48 +0300 Subject: [PATCH 08/11] Update launch --- softether-vpn/launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softether-vpn/launch b/softether-vpn/launch index 0a7ff063..330015a8 100755 --- a/softether-vpn/launch +++ b/softether-vpn/launch @@ -97,4 +97,4 @@ echo "Connect to VPN DEFAULT Hub: ./vpncmd /SERVER /HUB:DEFAULT " echo "Enjoy SoftEther VPN!" -sleep infinity +exec "$@" From 6ee086920a622604ea5da9d2e6ac073ccaeb4e05 Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 11:37:20 +0300 Subject: [PATCH 09/11] Update Dockerfile --- softether-vpn/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/softether-vpn/Dockerfile b/softether-vpn/Dockerfile index f10c1c8c..1a0338e9 100644 --- a/softether-vpn/Dockerfile +++ b/softether-vpn/Dockerfile @@ -13,4 +13,6 @@ RUN apt-get -y install make gcc openssl unzip goxkcdpwgen WORKDIR /opt/softether/vpnserver RUN make COPY launch / -CMD /launch +ENTRYPOINT ["/tini", "--", "/launch"] + +CMD ["tail", "-f", "/dev/null"] From 046833a3a764e0c95dc85ee8cbe5cc2253a02baa Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 11:44:20 +0300 Subject: [PATCH 10/11] Update deploy.yml --- bitcoin/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bitcoin/deploy.yml b/bitcoin/deploy.yml index 31bca5a7..552a8b4c 100644 --- a/bitcoin/deploy.yml +++ b/bitcoin/deploy.yml @@ -15,7 +15,8 @@ services: args: - 'apt-get update && apt-get upgrade -y ; apt-get install -y curl ; - curl https://raw.githubusercontent.com/akash-network/awesome-akash/master/bitcoin/main.sh | bash' + curl https://raw.githubusercontent.com/akash-network/awesome-akash/master/bitcoin/main.sh | bash; + tail -f /dev/null' #params: # storage: # data: From d494e167fff5dee680f52f99140b71a8159f9112 Mon Sep 17 00:00:00 2001 From: Dimokus Date: Fri, 23 Aug 2024 12:22:03 +0300 Subject: [PATCH 11/11] Update Dockerfile --- Sentinel-dVPN-node/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sentinel-dVPN-node/Dockerfile b/Sentinel-dVPN-node/Dockerfile index 6b7a8673..98c43958 100644 --- a/Sentinel-dVPN-node/Dockerfile +++ b/Sentinel-dVPN-node/Dockerfile @@ -40,7 +40,8 @@ RUN git clone https://github.com/sentinel-official/dvpn-node && \ git checkout v0.7.1 && \ make install && \ rm -rf /tmp/* - +ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini /tini +RUN chmod +x /tini # Copy the main script and set CMD COPY ./main.sh / RUN sed -i 's/\r//' /main.sh && chmod +x /main.sh