Skip to content
Snippets Groups Projects
Commit 477c825a authored by Jan David Mol's avatar Jan David Mol
Browse files

L2SS-217: Run JIVE container on host network, instead of the custom...

L2SS-217: Run JIVE container on host network, instead of the custom NETWORK_MODE, to allow it to connect to DISPLAY.
parent c49467ce
No related branches found
No related tags found
1 merge request!31L2SS-217: Run JIVE container on host network, instead of the custom...
......@@ -2,6 +2,12 @@
# Docker compose file that launches Jive, sending output to a remote X11
# display.
#
# This container will always run on the same network as the host,
# to make sure the DISPLAY variable can be used verbatim. For the
# same reason, TANGO_HOST is hardcoded to be at localhost:10000:
# the docker network offering our tangodb also exposes it on port 10000
# on the host.
#
# Defines:
# - jive: container running Jive
#
......@@ -14,7 +20,7 @@ services:
jive:
image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/tango-java:latest
container_name: ${CONTAINER_NAME_PREFIX}jive
network_mode: ${NETWORK_MODE}
network_mode: host
volumes:
- ${XAUTHORITY_MOUNT}
- ${TANGO_SKA_CONTAINER_MOUNT}
......@@ -23,10 +29,10 @@ services:
environment:
- XAUTHORITY=${XAUTHORITY}
- DISPLAY=${DISPLAY}
- TANGO_HOST=${TANGO_HOST}
- TANGO_HOST=localhost:10000
entrypoint:
- /usr/local/bin/wait-for-it.sh
- ${TANGO_HOST}
- localhost:10000
- --timeout=30
- --strict
- --
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment