diff --git a/bluesky-queueserver/dockerfile b/bluesky-queueserver/dockerfile index 61af7f1..e2b3160 100644 --- a/bluesky-queueserver/dockerfile +++ b/bluesky-queueserver/dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:trixie RUN apt update RUN apt install git -y RUN apt install librdkafka-dev -y diff --git a/hwproxy/dockerfile b/hwproxy/dockerfile index 10bcada..cd3bb08 100644 --- a/hwproxy/dockerfile +++ b/hwproxy/dockerfile @@ -1,14 +1,22 @@ -FROM debian:bullseye +FROM debian:trixie # python RUN apt update RUN apt install git -y RUN apt install librdkafka-dev -y RUN apt install python3-pip -y +RUN apt install python3-venv -y # happi COPY ./happi.ini /happi.ini COPY ./requirements.txt ./ + +# Create a virtual environment +RUN python3 -m venv /opt/venv + +# Activate the virtual environment +ENV PATH="/opt/venv/bin:$PATH" + RUN pip install -r requirements.txt ENV HAPPI_CFG /happi.ini diff --git a/hwproxy/requirements.txt b/hwproxy/requirements.txt index dea3fce..d2e9854 100644 --- a/hwproxy/requirements.txt +++ b/hwproxy/requirements.txt @@ -1,9 +1,9 @@ bluesky==1.10.0 -pint==0.19.2 -numpy==1.26.4 -attune==0.4.4 -happi==1.14.0 -yaqc-bluesky==2022.4.1 -bluesky-queueserver==0.0.16 -wright-plans==2022.7.0 -bluesky-hwproxy==2022.8.0 +pint +numpy +attune +happi +yaqc-bluesky +bluesky-queueserver +wright-plans +bluesky-hwproxy diff --git a/re-manager/dockerfile b/re-manager/dockerfile index 594ad95..72081be 100644 --- a/re-manager/dockerfile +++ b/re-manager/dockerfile @@ -1,10 +1,11 @@ -FROM debian:bullseye +FROM debian:bookworm # python RUN apt update RUN apt install git -y RUN apt install librdkafka-dev -y RUN apt install python3-pip -y +RUN apt install python3-venv -y COPY ./databroker-config.yml /usr/local/share/intake/catalog.yml COPY ./happi.ini /happi.ini @@ -13,6 +14,13 @@ COPY ./start_re.sh ./start_re.sh COPY ./user_group_permissions.yaml ./user_group_permissions.yaml COPY ./requirements.txt /requirements.txt +# Create a virtual environment +RUN python3 -m venv /opt/venv + +# Activate the virtual environment +ENV PATH="/opt/venv/bin:$PATH" + +# Install dependencies RUN python3 -m pip install -r requirements.txt ENV PYTHONUNBUFFERED 1 diff --git a/re-manager/requirements.txt b/re-manager/requirements.txt index 61fbbe8..47c05b1 100644 --- a/re-manager/requirements.txt +++ b/re-manager/requirements.txt @@ -1,8 +1,8 @@ +attune bluesky==1.10.0 -pint==0.19.2 -numpy==1.26.4 -attune==0.4.4 -happi==1.14.0 -yaqc-bluesky==2022.4.1 -bluesky-queueserver==0.0.16 -wright-plans==2022.7.0 +bluesky-queueserver==0.0.20 +happi +numpy +pint +wright-plans +yaqc-bluesky diff --git a/re-manager/start_re.sh b/re-manager/start_re.sh index 8349952..a0f2e85 100755 --- a/re-manager/start_re.sh +++ b/re-manager/start_re.sh @@ -1,5 +1,4 @@ #! /bin/sh qserver-list-plans-devices --startup-script startup.py -/usr/local/bin/start-re-manager --databroker-config=mongo --startup-script=./startup.py --existing-plans-devices=./existing_plans_and_devices.yaml --user-group-permissions=./user_group_permissions.yaml --zmq-data-proxy-addr zmq-proxy:5567 --redis-addr redis:6379 --zmq-publish-console ON - +start-re-manager --databroker-config=mongo --startup-script=./startup.py --existing-plans-devices=./existing_plans_and_devices.yaml --user-group-permissions=./user_group_permissions.yaml --zmq-data-proxy-addr zmq-proxy:5567 --redis-addr redis:6379 --zmq-publish-console ON diff --git a/slack/dockerfile b/slack/dockerfile index f965cd1..9621b5f 100644 --- a/slack/dockerfile +++ b/slack/dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-bullseye +FROM python:3.12-trixie COPY ./requirements.txt ./ RUN python3 -m pip install -r requirements.txt COPY ./slack_bot.py ./ diff --git a/slack/requirements.txt b/slack/requirements.txt index 46fac10..6e101d7 100644 --- a/slack/requirements.txt +++ b/slack/requirements.txt @@ -1,5 +1,5 @@ bluesky==1.10.0 -pyzmq==23.2.0 +pyzmq slack_sdk slack_bolt aiohttp diff --git a/wt5/dockerfile b/wt5/dockerfile index b1d642d..ec72197 100644 --- a/wt5/dockerfile +++ b/wt5/dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-bullseye +FROM python:3.12-trixie COPY ./requirements.txt ./ RUN python3 -m pip install -r requirements.txt COPY ./wt5_event_model.py ./ diff --git a/wt5/requirements.txt b/wt5/requirements.txt index 25a08d9..54be541 100644 --- a/wt5/requirements.txt +++ b/wt5/requirements.txt @@ -1,5 +1,5 @@ bluesky==1.10.0 -WrightTools==3.4.6 -pyzmq==23.2.0 -numpy==1.23.1 -toolz==0.12.0 +WrightTools +pyzmq +numpy +toolz diff --git a/zmq-proxy/dockerfile b/zmq-proxy/dockerfile index 07ba4f2..6471b16 100644 --- a/zmq-proxy/dockerfile +++ b/zmq-proxy/dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-bullseye +FROM python:3.12-trixie COPY ./requirements.txt ./ RUN python3 -m pip install -r requirements.txt CMD ["bluesky-0MQ-proxy", "5567", "5568"] diff --git a/zmq-proxy/requirements.txt b/zmq-proxy/requirements.txt index edc5acf..fabbdfa 100644 --- a/zmq-proxy/requirements.txt +++ b/zmq-proxy/requirements.txt @@ -1,2 +1,2 @@ bluesky==1.10.0 -pyzmq==23.2.0 +pyzmq