Skip to content

Commit cafdd55

Browse files
authored
Fix dockerfile (#1567)
* Fix dockerfile
1 parent b825cdb commit cafdd55

File tree

3 files changed

+27
-20
lines changed

3 files changed

+27
-20
lines changed

Dockerfile.blueapi

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Before changing this BlueAPI version number, you should check that
22
# the BlueAPI pin in pyproject.toml is compatible, else the version will
33
# be overridden
4-
FROM ghcr.io/diamondlightsource/blueapi:1.0.0-rc.2
4+
FROM ghcr.io/diamondlightsource/blueapi:latest
5+
USER root
56

67
ARG DEBIAN_FRONTEND=noninteractive
78

@@ -11,8 +12,6 @@ RUN apt update -y && \
1112
apt upgrade -y && \
1213
apt install -y libgl1 libglib2.0-0
1314

14-
RUN /venv/bin/pip install --no-cache-dir --no-compile mx-bluesky
15+
RUN uv pip install --no-cache-dir --no-compile mx-bluesky
1516

16-
# Needed so that Blueapi's setup-scratch stage has permission to modify dependencies installed
17-
# in the above pip installation
18-
RUN mkdir -p /.cache/pip; chmod -R 777 /venv /.cache/pip
17+
USER ubuntu

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies = [
2525
"matplotlib",
2626
"nexgen >= 0.11.0",
2727
"numpy >= 2.3.5",
28-
"opencv-python", # Needed for I24 ssx moveonclick. To be changed to headless once this is moved to separate ui.
28+
"opencv-python", # Needed for I24 ssx moveonclick. To be changed to headless once this is moved to separate ui.
2929
"opentelemetry-distro",
3030
"opentelemetry-exporter-otlp",
3131
"pydantic",
@@ -40,6 +40,7 @@ dependencies = [
4040
"matplotlib",
4141
"cachetools",
4242
"bluesky-stomp >= 0.2.0",
43+
"mysql-connector-python == 9.5.0", # see https://github.com/DiamondLightSource/mx-bluesky/issues/1568
4344

4445
#
4546
# These dependencies may be issued as pre-release versions and should have a pin constraint

0 commit comments

Comments
 (0)