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

entrypoint - add parameters for socket bind address and port

Browse source 
entrypoint.py
-------------
Allow the user to set the port number also for the remote worker
Allow the user to set the binding address for the composer api or remote worker api
Set the default port of the composer API to 8080

Dockerfile-ubi
--------------
Remove setting the port for the composer API since the default is
already 8080
This commit is contained in:
Ygal Blum 2022-05-01 15:01:09 +03:00 • committed by Ondřej Budai
parent 082da070d1
commit fc87b1740e
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,10 +50,17 @@ class Cli(contextlib.AbstractContextManager):
self._parser.add_argument( self._parser.add_argument(
"--composer-api-port", "--composer-api-port",
type=int, type=int,
default=443, default=8080,
dest="composer_api_port", dest="composer_api_port",
help="Port which the composer-API listens on", help="Port which the composer-API listens on",
) )
self._parser.add_argument(
"--composer-api-bind-address",
type=str,
default="::",
dest="composer_api_bind_address",
help="Bind the composer API to the specified address",
)
# --[no-]local-worker-api # --[no-]local-worker-api
self._parser.add_argument( self._parser.add_argument(
@ -82,6 +89,20 @@ class Cli(contextlib.AbstractContextManager):
dest="remote_worker_api", dest="remote_worker_api",
help="Disable the remote-worker-API", help="Disable the remote-worker-API",
) )
self._parser.add_argument(
"--remote-worker-api-port",
type=int,
default=8700,
dest="remote_worker_api_port",
help="Port which the remote-worker API listens on",
)
self._parser.add_argument(
"--remote-worker-api-bind-address",
type=str,
default="::",
dest="remote_worker_api_bind_address",
help="Bind the remote worker API to the specified address",
)
# --[no-]weldr-api # --[no-]weldr-api
self._parser.add_argument( self._parser.add_argument(
@ -171,7 +192,7 @@ class Cli(contextlib.AbstractContextManager):
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(("::", self.args.composer_api_port)) sock.bind((self.args.composer_api_bind_address, 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")
@ -194,12 +215,12 @@ class Cli(contextlib.AbstractContextManager):
# osbuild-remote-worker.socket # osbuild-remote-worker.socket
if self.args.remote_worker_api: if self.args.remote_worker_api:
print("Create remote-worker-api socket", file=sys.stderr) print(f"Create remote-worker-api socket on address [{self.args.remote_worker_api_bind_address}]:{self.args.remote_worker_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(("::", 8700)) sock.bind((self.args.remote_worker_api_bind_address, self.args.remote_worker_api_port))
sock.listen(256) sock.listen(256)
sockets.append(sock) sockets.append(sock)
names.append("osbuild-remote-worker.socket") names.append("osbuild-remote-worker.socket")

2
distribution/Dockerfile-ubi
View file

@ -23,4 +23,4 @@ COPY ./internal/jobqueue/dbjobqueue/schemas /opt/migrate/schemas
COPY --from=builder2 /opt/app-root/src/go/bin/tern /opt/migrate/ COPY --from=builder2 /opt/app-root/src/go/bin/tern /opt/migrate/
EXPOSE 8080 8700 EXPOSE 8080 8700
ENTRYPOINT ["python3", "/opt/entrypoint.py", "--remote-worker-api", "--composer-api", "--composer-api-port", "8080"] ENTRYPOINT ["python3", "/opt/entrypoint.py", "--remote-worker-api", "--composer-api"]