From 946a0b425ac7f95b381e320eda5b064c649b3c0f Mon Sep 17 00:00:00 2001 From: Sanne Raymaekers Date: Wed, 23 Dec 2020 17:08:17 +0100 Subject: [PATCH] containers: Specify port for the composer-api as argument --- containers/osbuild-composer/entrypoint.py | 11 +++++++++-- distribution/Dockerfile-ubi | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/containers/osbuild-composer/entrypoint.py b/containers/osbuild-composer/entrypoint.py index 4b091d960..5bf9c80f0 100644 --- a/containers/osbuild-composer/entrypoint.py +++ b/containers/osbuild-composer/entrypoint.py @@ -45,6 +45,13 @@ class Cli(contextlib.AbstractContextManager): dest="composer_api", help="Disable the composer-API", ) + self._parser.add_argument( + "--composer-api-port", + type=int, + default=443, + dest="composer_api_port", + help="Port which the composer-API listens on", + ) # --[no-]local-worker-api self._parser.add_argument( @@ -135,12 +142,12 @@ class Cli(contextlib.AbstractContextManager): # osbuild-composer-api.socket if self.args.composer_api: - print("Create composer-api socket", file=sys.stderr) + print("Create composer-api socket on port {}".format(self.args.composer_api_port) , file=sys.stderr) sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) self._exitstack.enter_context(contextlib.closing(sock)) sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) sock.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0) - sock.bind(("::", 443)) + sock.bind(("::", self.args.composer_api_port)) sock.listen() sockets.append(sock) names.append("osbuild-composer-api.socket") diff --git a/distribution/Dockerfile-ubi b/distribution/Dockerfile-ubi index 248fa07d4..8a3bf0cf8 100644 --- a/distribution/Dockerfile-ubi +++ b/distribution/Dockerfile-ubi @@ -14,5 +14,5 @@ COPY --from=builder /opt/app-root/src/go/bin/osbuild-composer /usr/libexec/osbui COPY ./containers/osbuild-composer/entrypoint.py /opt/entrypoint.py COPY ./dnf-json /usr/libexec/osbuild-composer/ -EXPOSE 443 8700 -ENTRYPOINT ["python3", "/opt/entrypoint.py", "--remote-worker-api", "--composer-api"] +EXPOSE 9196 8700 +ENTRYPOINT ["python3", "/opt/entrypoint.py", "--remote-worker-api", "--composer-api", "--composer-api-port", "9196"]