Made similar changes to 'murfey-instrument-server' Dockerfile

Author: tieneupin

Dockerfiles/murfey-instrument-server

@@ -2,7 +2,7 @@
 # podman build --build-arg groupid=<groupid> --build-arg userid=<userid> --build-arg groupname=<groupname> --no-cache -f path/to/Dockerfiles/murfey-instrument-server -t murfey-instrument-server:<version> path/to/python-murfey
 
 # Set up the Python base image to build with
-FROM docker.io/library/python:3.12.8-slim-bullseye as build
+FROM docker.io/library/python:3.12.8-slim-bullseye AS base
 
 # Define external build arguments
 ARG groupid
@@ -11,6 +11,8 @@ ARG userid
 
 # Add system dependencies for the developer/build environment
 # Add the group and user ID to be used by Murfey
+# Create virtual Python environment in which to install Murfey
+# Change properties of said Python environment
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y --no-install-recommends \
@@ -19,34 +21,25 @@ RUN apt-get update && \
         git \
         net-tools \
         libpq-dev && \
-    busybox --install &&\
+    busybox --install && \
     rm -rf /var/lib/apt/lists/* && \
-    groupadd -r -g "${groupid}" "${groupname}" && useradd -r -M "${groupname}" -u "${userid}" -g "${groupname}"
-
-# Copy essential Murfey source files across from repo
-COPY --chown="${userid}":"${groupid}" src/murfey/ /repos/python-murfey/src/murfey/
-COPY --chown="${userid}":"${groupid}" \
-    pyproject.toml \
-    setup.py \
-    api-spec.yaml \
-    AUTHORS.rst \
-    catalog-info.yaml \
-    LICENSE \
-    MANIFEST.in \
-    README.md \
-    /repos/python-murfey/
-
-# Set the repo as the current working directory
-WORKDIR /repos/python-murfey
+    groupadd -r -g "${groupid}" "${groupname}" && \
+    useradd -r -M "${groupname}" -u "${userid}" -g "${groupname}" && \
+    python -m venv /venv && \
+    chown -R "${userid}":"${groupid}" /venv && \
+    chmod -R a+x /venv
+ENV PATH=/venv/bin:$PATH
 
-# Set up a virtual environment and install Murfey
-RUN python -m venv /venv && \
-    chmod -R a+x /venv && \
-    /venv/bin/python -m pip install --upgrade \
+# Build Murfey in a different image
+FROM base AS build
+COPY --chown="${userid}":"${groupid}" ./ /python-murfey/
+RUN python -m pip install --upgrade \
         pip \
         build \
         importlib-metadata &&\
-    /venv/bin/python -m pip install .[client,instrument-server]
+    python -m pip install /python-murfey[client,instrument-server] && \
+    chmod -R a+x /venv
 
-# Prepend the virtual environment to PATH
-ENV PATH=/venv/bin:$PATH
+# Copy installed files across to final image
+FROM base
+COPY --from=build --chown="${userid}":"${groupid}" /venv/ /venv/