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

Improve process handling #427

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ RUN chmod +x /opt/scrutiny/bin/scrutiny && \
chmod -R ugo+rwx /opt/scrutiny/config


CMD ["/init"]
ENTRYPOINT ["/init"]
2 changes: 1 addition & 1 deletion docker/entrypoint-collector.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ fi

# now that we have the env start cron in the foreground
echo "starting cron"
su -c "cron -f -L 15" root
exec cron -f -L 15
2 changes: 1 addition & 1 deletion rootfs/etc/services.d/collector-once/run
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ s6-svc -O /var/run/s6/services/collector-once
until $(curl --output /dev/null --silent --head --fail http://localhost:8080/api/health); do echo "scrutiny api not ready" && sleep 5; done

echo "starting scrutiny collector (run-once mode. subsequent calls will be triggered via cron service)"
/opt/scrutiny/bin/scrutiny-collector-metrics run
exec /opt/scrutiny/bin/scrutiny-collector-metrics run
2 changes: 1 addition & 1 deletion rootfs/etc/services.d/cron/run
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash

echo "starting cron"
cron -f -L 15
exec cron -f -L 15
2 changes: 1 addition & 1 deletion rootfs/etc/services.d/influxdb/run
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ EOF
fi

echo "starting influxdb"
influxd run
exec influxd run
2 changes: 1 addition & 1 deletion rootfs/etc/services.d/scrutiny/run
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ echo "waiting for influxdb"
until $(curl --output /dev/null --silent --head --fail http://localhost:8086/health); do echo "influxdb not ready" && sleep 5; done

echo "starting scrutiny"
scrutiny start
exec scrutiny start