Replace 'sisock-crossbar' with 'crossbar' (#118)

simonsobs · Oct 30, 2020 · d4ae11d · d4ae11d
1 parent 6b7e9ca
commit d4ae11d
Show file tree

Hide file tree

Showing 17 changed files with 32 additions and 32 deletions.
diff --git a/agents/cryomech_cpa/Dockerfile b/agents/cryomech_cpa/Dockerfile
@@ -17,5 +17,5 @@ COPY . /app/socs/agents/cryomech-cpa/
 
 ENTRYPOINT ["dumb-init", "python3", "-u", "cryomech_cpa_agent.py"]
 
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/labjack/Dockerfile b/agents/labjack/Dockerfile
@@ -27,5 +27,5 @@ RUN pip3 install --no-cache-dir https://labjack.com/sites/default/files/software
 ENTRYPOINT ["dumb-init", "python3", "-u", "labjack_agent.py"]
 
 # Sensible default arguments
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/lakeshore240/Dockerfile b/agents/lakeshore240/Dockerfile
@@ -13,5 +13,5 @@ COPY . .
 # Run registry on container startup
 ENTRYPOINT ["dumb-init", "python3", "-u", "LS240_agent.py"]
 
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/lakeshore372/Dockerfile b/agents/lakeshore372/Dockerfile
@@ -14,5 +14,5 @@ COPY . .
 ENTRYPOINT ["dumb-init", "python3", "-u", "LS372_agent.py"]
 
 # Sensible default arguments
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/meinberg_m1000/Dockerfile b/agents/meinberg_m1000/Dockerfile
@@ -20,5 +20,5 @@ COPY mibs/ /usr/local/lib/python3.6/dist-packages/pysnmp/smi/mibs/
 ENTRYPOINT ["dumb-init", "python3", "-u", "meinberg_m1000_agent.py"]
 
 # Default site-hub
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/pfeiffer_tpg366/Dockerfile b/agents/pfeiffer_tpg366/Dockerfile
@@ -13,5 +13,5 @@ COPY . .
 # Run registry on container startup
 ENTRYPOINT ["dumb-init", "python3", "-u", "pfeiffer_tpg366_agent.py"]
 
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/pysmurf_archiver/Dockerfile b/agents/pysmurf_archiver/Dockerfile
@@ -16,5 +16,5 @@ RUN pip3 install -r requirements.txt
 # Run registry on container startup
 ENTRYPOINT ["dumb-init", "python3", "-u", "pysmurf_archiver_agent.py"]
 
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/pysmurf_controller/Dockerfile b/agents/pysmurf_controller/Dockerfile
@@ -34,5 +34,5 @@ RUN pip3 install -r requirements.txt
 ENTRYPOINT ["dumb-init", "python3", "-u", "pysmurf_controller.py"]
 
 # Sensible defaults for setup with sisock
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/pysmurf_monitor/Dockerfile b/agents/pysmurf_monitor/Dockerfile
@@ -15,5 +15,5 @@ RUN pip3 install -r requirements.txt
 # Run registry on container startup
 ENTRYPOINT ["dumb-init", "python3", "-u", "pysmurf_monitor.py"]
 
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/scpi_psu/Dockerfile b/agents/scpi_psu/Dockerfile
@@ -13,5 +13,5 @@ COPY . .
 # Run agent on container startup
 ENTRYPOINT ["dumb-init", "python3", "-u", "scpi_psu_agent.py"]
 
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/smurf_recorder/Dockerfile b/agents/smurf_recorder/Dockerfile
@@ -11,5 +11,5 @@ COPY . .
 ENTRYPOINT ["dumb-init", "python3", "-u", "smurf_recorder.py"]
 
 # Default site-hub
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/smurf_stream_simulator/Dockerfile b/agents/smurf_stream_simulator/Dockerfile
@@ -10,5 +10,5 @@ COPY . .
 ENTRYPOINT ["dumb-init", "python3", "-u", "smurf_stream_simulator.py"]
 
 
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/agents/synacc/Dockerfile b/agents/synacc/Dockerfile
@@ -15,5 +15,5 @@ RUN pip3 install -r requirements.txt
 ENTRYPOINT ["python3", "-u", "synacc.py"]
 
 # Sensible default arguments
-CMD ["--site-hub=ws://sisock-crossbar:8001/ws", \
-     "--site-http=http://sisock-crossbar:8001/call"]
+CMD ["--site-hub=ws://crossbar:8001/ws", \
+     "--site-http=http://crossbar:8001/call"]
diff --git a/docs/agents/lakeshore240.rst b/docs/agents/lakeshore240.rst
@@ -101,16 +101,16 @@ Docker container. An example configuration is::
   ocs-LSA24MA:
     image: grumpy.physics.yale.edu/ocs-lakeshore240-agent:latest
     depends_on:
-      - "sisock-crossbar"
+      - "crossbar"
     devices:
       - "/dev/LSA24MA:/dev/LSA24MA"
     hostname: nuc-docker
     volumes:
       - ${OCS_CONFIG_DIR}:/config:ro
     command:
       - "--instance-id=LSA24MA"
-      - "--site-hub=ws://sisock-crossbar:8001/ws"
-      - "--site-http=http://sisock-crossbar:8001/call"
+      - "--site-hub=ws://crossbar:8001/ws"
+      - "--site-http=http://crossbar:8001/call"
 
 The serial number will need to be updated in your configuration. The hostname
 should also match your configured host in your OCS configuration file. The

diff --git a/docs/agents/pysmurf/pysmurf-archiver.rst b/docs/agents/pysmurf/pysmurf-archiver.rst
@@ -59,7 +59,7 @@ The docker-compose entry is similar to that of the pysmurf-monitor. For example:
             - /home/ocs:/home/ocs
             - /data:/data
         depends_on:
-            - "sisock-crossbar"
+            - "crossbar"
 
 Archived Path
 --------------

diff --git a/docs/agents/pysmurf/pysmurf-controller.rst b/docs/agents/pysmurf/pysmurf-controller.rst
@@ -86,7 +86,7 @@ named ``ocs-pysmurf-monitor`` might look something like::
             - /data:/data
             - /path/to/dev/pysmurf/:/usr/local/src/pysmurf
         depends_on:
-            - "sisock-crossbar"
+            - "crossbar"
 
 
 

diff --git a/docs/agents/pysmurf/pysmurf-monitor.rst b/docs/agents/pysmurf/pysmurf-monitor.rst
@@ -139,7 +139,7 @@ An example docker-compose entry might look like::
             - ${OCS_CONFIG_DIR}:/config
             - /data:/data
         depends_on:
-            - "sisock-crossbar"
+            - "crossbar"
 
 Where DB_HOST, DB, DB_USER, and DB_PW are set in the ``.env`` file in the same dir as
 the docker-compose file.