Skip to content

Commit 4348fb3

Browse files
cjtituscjtitus
committed
compose files cleaned up, should be totally self-contained without dev option
1 parent a3df240 commit 4348fb3

File tree

9 files changed

+32
-20
lines changed

9 files changed

+32
-20
lines changed

‎compose/bluesky-services/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ services:
1818
- bluesky
1919

2020
zmq_proxy:
21-
image: bluesky
21+
image: ghcr.io/xraygui/nbs-pods/bluesky:latest
2222
command: bluesky-0MQ-proxy 4567 5678
2323
networks:
2424
- bluesky
2525

2626
zmq_proxy2:
27-
image: bluesky
27+
image: ghcr.io/xraygui/nbs-pods/bluesky:latest
2828
command: bluesky-0MQ-proxy 5577 5578
2929
networks:
3030
- bluesky

‎compose/gui/docker-compose.development.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
services:
22
qs-gui:
3-
command: tail -f /dev/null
3+
volumes:
4+
- ${NBS_PODS_DIR}/config/bluesky:/etc/bluesky
5+
- ${BEAMLINE_PODS_DIR}/config/ipython:/usr/local/share/ipython
6+
- ${NBS_PODS_DIR}/config/tiled:/etc/tiled

‎compose/gui/docker-compose.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ networks:
44
external: true
55
services:
66
qs-gui:
7-
image: nbs_gui:latest
7+
image: ghcr.io/xraygui/nbs-pods/nbs-gui:latest
88
volumes:
99
- /run/user/${HOST_UID}:/run/user/${HOST_UID}
10-
- ${NBS_PODS_DIR}/config/bluesky:/etc/bluesky
11-
- ${BEAMLINE_PODS_DIR}/config/ipython:/usr/local/share/ipython
12-
- ${NBS_PODS_DIR}/config/tiled:/etc/tiled
1310
devices:
1411
- /dev/dri:/dev/dri
1512
- /dev/video0:/dev/video0
@@ -21,10 +18,6 @@ services:
2118
- EPICS_CA_AUTO_ADDR_LIST=YES
2219
- QSERVER_ZMQ_INFO_ADDRESS=tcp://acq_qs:60625
2320
- QSERVER_ZMQ_CONTROL_ADDRESS=tcp://acq_qs:60615
24-
command: >
25-
bash -c "
26-
tail -f /dev/null
27-
nbs-gui --profile default
28-
"
21+
command: nbs-gui --profile default
2922
networks:
3023
- bluesky-services_bluesky

‎compose/queueserver/docker-compose.development.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: '3'
2+
3+
services:
4+
acq_qs:
5+
image: nbs:latest
6+
volumes:
7+
- ${BEAMLINE_PODS_DIR}/config/ipython:/usr/local/share/ipython
8+
- ${NBS_PODS_DIR}/config/tiled/profiles:/etc/tiled/profiles
9+
- ${NBS_PODS_DIR}/config/bluesky:/etc/bluesky

‎compose/queueserver/docker-compose.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ networks:
66

77
services:
88
acq_qs:
9-
image: nbs:latest
10-
volumes:
11-
- ${BEAMLINE_PODS_DIR}/config/ipython:/usr/local/share/ipython
9+
image: ghcr.io/xraygui/nbs-pods/nbs:latest
1210
environment:
1311
- IPYTHONDIR=/usr/local/share/ipython
1412
- EPICS_CA_AUTO_ADDR_LIST=yes

compose/sim/docker-compose.override.yml renamed to compose/sim/docker-compose.development.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ services:
22
nbs-sim:
33
volumes:
44
- ${NBSDIR}:/usr/local/src/xraygui
5-
- ${HOME}/work/caproto:/usr/local/src/caproto
5+
- ${BEAMLINE_PODS_DIR}/config/ipython:/usr/local/share/ipython
66
command: >
77
bash -c "
8-
pip3 install --no-deps --no-build-isolation /usr/local/src/caproto &&
8+
tail -f /dev/null &&
99
pip3 install --no-deps --no-build-isolation -e /usr/local/src/xraygui/nbs-sim/src &&
1010
nbs-sim --startup-dir /usr/local/share/ipython/profile_default/startup --list-pvs
1111
"

‎compose/sim/docker-compose.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ networks:
66

77
services:
88
nbs-sim:
9-
image: nbs:latest
10-
volumes:
11-
- ${BEAMLINE_PODS_DIR}/config/ipython:/usr/local/share/ipython
9+
image: ghcr.io/xraygui/nbs-pods/nbs:latest
1210
command: nbs-sim --startup-dir /usr/local/share/ipython/profile_default/startup --list-pvs
1311
networks:
1412
- bluesky-services_bluesky

‎images/nbs/Containerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG BASE_IMAGE=bluesky
22
FROM ${BASE_IMAGE}
33

4+
RUN pip3 install git+https://github.com/cjtitus/caproto.git@no_macros
45
RUN pip3 install git+https://github.com/xraygui/nbs-core
56
RUN pip3 install git+https://github.com/xraygui/nbs-bl
67
RUN pip3 install git+https://github.com/xraygui/nbs-sim
@@ -13,5 +14,6 @@ RUN mkdir -p /etc/bluesky
1314
# Copy default configurations
1415
COPY config/tiled/profiles/ /etc/tiled/profiles/
1516
COPY config/bluesky/ /etc/bluesky/
17+
COPY config/ipython/ /usr/local/share/ipython/
1618

1719
LABEL version="0.0.1"

‎scripts/deploy.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ usage() {
3939
exit 1
4040
}
4141

42+
start_demo() {
43+
for service in "bluesky-services" "gui" "queueserver" "sim"; do
44+
start_service "$service" false
45+
done
46+
}
47+
4248
start_services() {
4349
local dev_mode=false
4450
local services=()
@@ -92,6 +98,9 @@ elif [ "$1" = "start" ]; then
9298
elif [ "$1" = "stop" ]; then
9399
shift
94100
stop_services "$@"
101+
elif [ "$1" = "demo" ]; then
102+
shift
103+
start_demo "$@"
95104
else
96105
usage
97106
fi

0 commit comments

Comments
 (0)