Also run all builds on approved MRs
This commit is contained in:
Jonas Zohren 2022-02-01 23:51:38 +00:00
parent e24d75cffc
commit 9478c75f9d
No known key found for this signature in database
GPG key ID: FE3ED5D90A175463
6 changed files with 24 additions and 68 deletions

View file

@ -19,8 +19,10 @@ ENV CONDUIT_CONFIG="/srv/conduit/conduit.toml"
# Conduit needs:
# ca-certificates: for https
# iproute2: for `ss` for the healthcheck script
RUN apk add --no-cache \
ca-certificates
ca-certificates \
iproute2
ARG CREATED

View file

@ -3,7 +3,7 @@
# If the config file does not contain a default port and the CONDUIT_PORT env is not set, create
# try to get port from process list
if [ -z "${CONDUIT_PORT}" ]; then
CONDUIT_PORT=$(netstat -tlp | grep conduit | grep -m1 -o ':[0-9]*' | grep -m1 -o '[0-9]*')
CONDUIT_PORT=$(ss -tlpn | grep conduit | grep -m1 -o ':[0-9]*' | grep -m1 -o '[0-9]*')
fi
# The actual health check.