Start avahi in translator image

ICRAR · Apr 12, 2024 · 662ffc4 · 662ffc4
1 parent e96198c
commit 662ffc4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/daliuge-engine/run_engine.sh b/daliuge-engine/run_engine.sh
@@ -56,7 +56,7 @@ case "$1" in
         echo "docker run -td ${DOCKER_OPTS}  icrar/daliuge-engine:${C_TAG}"
         docker run -td ${DOCKER_OPTS}  icrar/daliuge-engine:${C_TAG}
         sleep 3
-        docker exec -u root daliuge-engine bash -c "service avahi-daemon stop && service dbus restart && service avahi-daemon start"
+        docker exec -u root daliuge-engine bash -c "service avahi-daemon stop > /dev/null 2>&1 && service dbus restart > /dev/null 2>&1 && service avahi-daemon start > /dev/null 2>&1"
         ENGINE_NAME=`docker exec daliuge-engine sh -c "hostname"`
         ENGINE_IP=`docker exec daliuge-engine sh -c "hostname --ip-address"`
         curl -X POST http://${ENGINE_IP}:9000/managers/island/start

diff --git a/daliuge-translator/docker/Dockerfile.dev b/daliuge-translator/docker/Dockerfile.dev
@@ -7,12 +7,11 @@ ARG BUILD_ID
 FROM icrar/daliuge-common:${VCS_TAG:-latest}
 LABEL stage=builder
 LABEL build=$BUILD_ID
-# all dependencies are already installed in daliuge-common
-# RUN apt-get update && \
-#     apt-get clean && \
-#     apt install -y gcc python3-venv python3-distutils
 
-RUN service avahi-daemon stop && service dbus start && service avahi-daemon start && avahi-set-host-name dlg-engine
+RUN service avahi-daemon stop && \
+    service dbus start && \
+    service avahi-daemon start && \
+    avahi-set-host-name dlg-trans
 COPY / /daliuge
 RUN . /dlg/bin/activate && \
     cd /daliuge && \

diff --git a/daliuge-translator/run_translator.sh b/daliuge-translator/run_translator.sh
@@ -6,8 +6,10 @@ case "$1" in
         docker run -h dlg-trans --name daliuge-translator --rm -td -p 8084:8084 icrar/daliuge-translator:${VCS_TAG};;
     "dev")
         export VCS_TAG=`git rev-parse --abbrev-ref HEAD| tr '[:upper:]' '[:lower:]'`
-        echo "Running Translator development version in foreground..."
-        docker run -h dlg-trans --volume $PWD/dlg/dropmake:/dlg/lib/python3.8/site-packages/dlg/dropmake --name daliuge-translator --rm -t -p 8084:8084 icrar/daliuge-translator:${VCS_TAG};;
+        echo "Running Translator development version in background..."
+        docker run -d -h dlg-trans --volume $PWD/dlg/dropmake:/dlg/lib/python3.8/site-packages/dlg/dropmake --name daliuge-translator --rm -t -p 8084:8084 icrar/daliuge-translator:${VCS_TAG}
+        sleep 3
+        docker exec -u root daliuge-translator bash -c "service avahi-daemon stop > /dev/null 2>&1 && service dbus restart > /dev/null 2>&1 && service avahi-daemon start > /dev/null 2>&1";;
     "casa")
         export VCS_TAG=`git rev-parse --abbrev-ref HEAD| tr '[:upper:]' '[:lower:]'`-casa
         echo "Running Translator development version in foreground..."