particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

containers: Specify port for the composer-api as argument

Browse source
This commit is contained in:
Sanne Raymaekers 2020-12-23 17:08:17 +01:00
parent 73deee0f43
commit 946a0b425a
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
containers/osbuild-composer/entrypoint.py
View file

@ -45,6 +45,13 @@ class Cli(contextlib.AbstractContextManager):
dest="composer_api", dest="composer_api",
help="Disable the 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 # --[no-]local-worker-api
self._parser.add_argument( self._parser.add_argument(
@ -135,12 +142,12 @@ class Cli(contextlib.AbstractContextManager):
# osbuild-composer-api.socket # osbuild-composer-api.socket
if self.args.composer_api: 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) sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
self._exitstack.enter_context(contextlib.closing(sock)) self._exitstack.enter_context(contextlib.closing(sock))
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0) sock.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
sock.bind(("::", 443)) sock.bind(("::", self.args.composer_api_port))
sock.listen() sock.listen()
sockets.append(sock) sockets.append(sock)
names.append("osbuild-composer-api.socket") names.append("osbuild-composer-api.socket")

4
distribution/Dockerfile-ubi
View file

@ -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 ./containers/osbuild-composer/entrypoint.py /opt/entrypoint.py
COPY ./dnf-json /usr/libexec/osbuild-composer/ COPY ./dnf-json /usr/libexec/osbuild-composer/
EXPOSE 443 8700 EXPOSE 9196 8700
ENTRYPOINT ["python3", "/opt/entrypoint.py", "--remote-worker-api", "--composer-api"] ENTRYPOINT ["python3", "/opt/entrypoint.py", "--remote-worker-api", "--composer-api", "--composer-api-port", "9196"]