diff --git a/containers/osbuild-composer/entrypoint.py b/containers/osbuild-composer/entrypoint.py index c01b577a1..83759b91c 100644 --- a/containers/osbuild-composer/entrypoint.py +++ b/containers/osbuild-composer/entrypoint.py @@ -9,6 +9,7 @@ a container. import argparse import contextlib import os +import pathlib import socket import subprocess import sys @@ -301,6 +302,10 @@ class Cli(contextlib.AbstractContextManager): res = 0 sockets = self._prepare_sockets() + liveness = pathlib.Path('/run/live') + + liveness.touch() + try: if self.args.builtin_worker: proc_worker = self._spawn_worker() @@ -324,7 +329,6 @@ class Cli(contextlib.AbstractContextManager): proc_dnf_json.terminate() proc_dnf_json.wait() - return res except KeyboardInterrupt: if proc_worker: proc_worker.terminate() @@ -343,6 +347,8 @@ class Cli(contextlib.AbstractContextManager): if proc_composer: proc_composer.kill() raise + finally: + liveness.unlink() return res diff --git a/templates/composer.yml b/templates/composer.yml index f965fc980..09ef60568 100644 --- a/templates/composer.yml +++ b/templates/composer.yml @@ -41,10 +41,10 @@ objects: name: composer livenessProbe: failureThreshold: 3 - httpGet: - path: ${LIVENESS_URI} - port: ${{COMPOSER_API_PORT}} - scheme: HTTP + exec: + command: + - cat + - /tmp/live periodSeconds: 10 successThreshold: 1 timeoutSeconds: 1