From d38493487ff0ac1fb8889edf510f2f184fde21d8 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Tue, 19 Oct 2021 11:16:48 +0000
Subject: [PATCH] L2SS-287: Flip entrypoint name and build wheel in tmp
---
bin/start-ds.sh | 4 ++--
docker-compose/device-boot.yml | 2 +-
docker-compose/device-docker.yml | 2 +-
docker-compose/device-observation_control.yml | 2 +-
docker-compose/device-recv.yml | 2 +-
docker-compose/device-sdp.yml | 2 +-
docker-compose/device-sst.yml | 2 +-
docker-compose/device-unb2.yml | 2 +-
docker-compose/device-xst.yml | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/bin/start-ds.sh b/bin/start-ds.sh
index add6bcc71..a64022016 100755
--- a/bin/start-ds.sh
+++ b/bin/start-ds.sh
@@ -22,9 +22,9 @@ if [[ $TANGOSTATIONCONTROL ]]; then
else
# Install the package, exit 1 if it fails
cd tangostationcontrol || exit 1
- python3 setup.py bdist_wheel || exit 1
+ python3 setup.py build --build-base /tmp/ egg_info --egg-base /tmp/ bdist_wheel --dist-dir /tmp/ || exit 1
# shellcheck disable=SC2012
- sudo pip install dist/"$(ls -Art dist/ | tail -n 1)"
+ sudo pip install "$(ls -Art /tmp/*.whl | tail -n 1)"
fi
/usr/local/bin/wait-for-it.sh "$TANGO_HOST" --timeout=30 --strict -- "$@"
diff --git a/docker-compose/device-boot.yml b/docker-compose/device-boot.yml
index 9a92221c2..216e6961a 100644
--- a/docker-compose/device-boot.yml
+++ b/docker-compose/device-boot.yml
@@ -33,5 +33,5 @@ services:
- bin/start-ds.sh
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# can't know about our Docker port forwarding
- - l2ss-boot LTS Boot/1 -v -ORBendPoint giop:tcp:0:5708 -ORBendPointPublish giop:tcp:${HOSTNAME}:5708
+ - l2ss-boot Boot LTS -v -ORBendPoint giop:tcp:0:5708 -ORBendPointPublish giop:tcp:${HOSTNAME}:5708
restart: unless-stopped
diff --git a/docker-compose/device-docker.yml b/docker-compose/device-docker.yml
index 23ba67432..777939eb1 100644
--- a/docker-compose/device-docker.yml
+++ b/docker-compose/device-docker.yml
@@ -37,5 +37,5 @@ services:
- bin/start-ds.sh
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# can't know about our Docker port forwarding
- - l2ss-docker-device LTS Docker/1 -v -ORBendPoint giop:tcp:0:5705 -ORBendPointPublish giop:tcp:${HOSTNAME}:5705
+ - l2ss-docker-device Docker LTS -v -ORBendPoint giop:tcp:0:5705 -ORBendPointPublish giop:tcp:${HOSTNAME}:5705
restart: unless-stopped
diff --git a/docker-compose/device-observation_control.yml b/docker-compose/device-observation_control.yml
index a8c1308d6..eb357e2ee 100644
--- a/docker-compose/device-observation_control.yml
+++ b/docker-compose/device-observation_control.yml
@@ -34,5 +34,5 @@ services:
- bin/start-ds.sh
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# can't know about our Docker port forwarding
- - l2ss-observation-control LTS ObservationControl/1 -v -ORBendPoint giop:tcp:0:5703 -ORBendPointPublish giop:tcp:${HOSTNAME}:5703
+ - l2ss-observation-control ObservationControl LTS -v -ORBendPoint giop:tcp:0:5703 -ORBendPointPublish giop:tcp:${HOSTNAME}:5703
restart: unless-stopped
diff --git a/docker-compose/device-recv.yml b/docker-compose/device-recv.yml
index dd5d92bb6..e846004bb 100644
--- a/docker-compose/device-recv.yml
+++ b/docker-compose/device-recv.yml
@@ -35,5 +35,5 @@ services:
- bin/start-ds.sh
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# can't know about our Docker port forwarding
- - l2ss-receiver LTS RECV/1 -v -ORBendPoint giop:tcp:0:5707 -ORBendPointPublish giop:tcp:${HOSTNAME}:5707
+ - l2ss-receiver RECV LTS -v -ORBendPoint giop:tcp:0:5707 -ORBendPointPublish giop:tcp:${HOSTNAME}:5707
restart: unless-stopped
diff --git a/docker-compose/device-sdp.yml b/docker-compose/device-sdp.yml
index 04442018d..116df55c9 100644
--- a/docker-compose/device-sdp.yml
+++ b/docker-compose/device-sdp.yml
@@ -35,5 +35,5 @@ services:
- bin/start-ds.sh
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# can't know about our Docker port forwarding
- - l2ss-sdp LTS SDP/1 -v -ORBendPoint giop:tcp:0:5701 -ORBendPointPublish giop:tcp:${HOSTNAME}:5701
+ - l2ss-sdp SDP LTS -v -ORBendPoint giop:tcp:0:5701 -ORBendPointPublish giop:tcp:${HOSTNAME}:5701
restart: unless-stopped
diff --git a/docker-compose/device-sst.yml b/docker-compose/device-sst.yml
index acd41d50d..be252a07e 100644
--- a/docker-compose/device-sst.yml
+++ b/docker-compose/device-sst.yml
@@ -38,5 +38,5 @@ services:
- bin/start-ds.sh
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# can't know about our Docker port forwarding
- - l2ss-sst LTS SST/1 -v -ORBendPoint giop:tcp:0:5702 -ORBendPointPublish giop:tcp:${HOSTNAME}:5702
+ - l2ss-sst SST LTS -v -ORBendPoint giop:tcp:0:5702 -ORBendPointPublish giop:tcp:${HOSTNAME}:5702
restart: unless-stopped
diff --git a/docker-compose/device-unb2.yml b/docker-compose/device-unb2.yml
index acc2a4739..f6545cf1b 100644
--- a/docker-compose/device-unb2.yml
+++ b/docker-compose/device-unb2.yml
@@ -35,5 +35,5 @@ services:
- bin/start-ds.sh
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# can't know about our Docker port forwarding
- - l2ss-unb2 LTS UNB2/1 -v -ORBendPoint giop:tcp:0:5704 -ORBendPointPublish giop:tcp:${HOSTNAME}:5704
+ - l2ss-unb2 UNB2 LTS -v -ORBendPoint giop:tcp:0:5704 -ORBendPointPublish giop:tcp:${HOSTNAME}:5704
restart: unless-stopped
diff --git a/docker-compose/device-xst.yml b/docker-compose/device-xst.yml
index ddb64b540..3509ee5a5 100644
--- a/docker-compose/device-xst.yml
+++ b/docker-compose/device-xst.yml
@@ -38,5 +38,5 @@ services:
- bin/start-ds.sh
# configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA
# can't know about our Docker port forwarding
- - l2ss-xst LTS XST/1 -v -ORBendPoint giop:tcp:0:5706 -ORBendPointPublish giop:tcp:${HOSTNAME}:5706
+ - l2ss-xst XST LTS -v -ORBendPoint giop:tcp:0:5706 -ORBendPointPublish giop:tcp:${HOSTNAME}:5706
restart: unless-stopped
--
GitLab