diff options
| author | Jonas Zohren <git-pbkyr@jzohren.de> | 2022-02-01 23:51:38 +0000 |
|---|---|---|
| committer | Jonas Zohren <git-pbkyr@jzohren.de> | 2022-02-02 13:31:28 +0100 |
| commit | 9478c75f9dcd040cb9f03deb5ea809f117985de2 (patch) | |
| tree | 747c64b47a04e246f5e1691868f951d0c5c45739 /docker | |
| parent | e24d75cffc8f00d526848a93a4e2cfce54bf69a2 (diff) | |
| download | conduit-9478c75f9dcd040cb9f03deb5ea809f117985de2.zip | |
Use prebuilt CI-containers from https://gitlab.com/jfowl/conduit-containers
Also run all builds on approved MRs
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ci-binaries-packaging.Dockerfile | 4 | ||||
| -rw-r--r-- | docker/healthcheck.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/ci-binaries-packaging.Dockerfile b/docker/ci-binaries-packaging.Dockerfile index a6339be..bb67bb2 100644 --- a/docker/ci-binaries-packaging.Dockerfile +++ b/docker/ci-binaries-packaging.Dockerfile @@ -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 diff --git a/docker/healthcheck.sh b/docker/healthcheck.sh index df7f18a..42b2e10 100644 --- a/docker/healthcheck.sh +++ b/docker/healthcheck.sh @@ -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. |