Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue 517 (zombie processes in docker containers) #568

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Sentinel-dVPN-node/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@ 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
CMD ["/main.sh"]
ENTRYPOINT ["/tini", "--", "/main.sh"]
CMD ["tail", "-f", "/dev/null"]

2 changes: 1 addition & 1 deletion Sentinel-dVPN-node/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ check_var() {
if [[ -z ${!var_name} ]]; then
echo "$error_message"
echo "For example: $example"
sleep infinity
exec "$@"
fi
}
update_config() {
Expand Down
3 changes: 2 additions & 1 deletion bitcoin/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion bitcoin/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
3 changes: 2 additions & 1 deletion cryptodredge-c11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion cryptodredge-c11/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions semantra/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "2.0"

services:
app:
image: ubuntu:latest
image: ubuntu:22.04

command:
- "bash"
Expand All @@ -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
Expand Down Expand Up @@ -65,4 +65,4 @@ deployment:
app:
akash:
profile: app
count: 1
count: 1
4 changes: 3 additions & 1 deletion softether-vpn/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion softether-vpn/launch
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@ echo "Connect to VPN DEFAULT Hub: ./vpncmd /SERVER /HUB:DEFAULT <host>"

echo "Enjoy SoftEther VPN!"

sleep infinity
exec "$@"