Update Dockerfile

Dockerfile

@@ -4,7 +4,7 @@ FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
 
 # -----------------------------
-# System dependencies
+# System deps
 # -----------------------------
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
@@ -20,13 +20,11 @@ RUN apt-get update \
 
 # -----------------------------
 # Node.js (v22.21.1) via nvm
-#   - npx needed by `make -C robot-server dev`
 # -----------------------------
 ENV NVM_DIR=/opt/nvm
 RUN mkdir -p ${NVM_DIR} \
  && curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 
-# Install & activate Node 22.21.1 (system-wide usable via PATH)
 ARG NODE_VERSION=22.21.1
 RUN bash -lc ". ${NVM_DIR}/nvm.sh \
  && nvm install ${NODE_VERSION} \
@@ -36,7 +34,6 @@ RUN bash -lc ". ${NVM_DIR}/nvm.sh \
  && npm -v \
  && npx -v"
 
-# Make node/npm/npx available in non-interactive shells too
 ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin:$PATH
 
 # -----------------------------
@@ -45,48 +42,40 @@ ENV PATH=${NVM_DIR}/versions/node/v${NODE_VERSION}/bin:$PATH
 RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
  && install -m 0755 /root/.local/bin/uv /usr/local/bin/uv
 
-# Put uv-managed python somewhere world-readable
 ENV UV_PYTHON_INSTALL_DIR=/opt/uv/python
 RUN mkdir -p /opt/uv/python \
  && chmod -R 755 /opt/uv
 
-# -----------------------------
-# Python via uv
-# -----------------------------
 ARG PYTHON_VERSION=3.12.12
 RUN uv python install ${PYTHON_VERSION}
 
 # -----------------------------
-# Clone Opentrons monorepo (default branch is edge)
+# Clone Opentrons monorepo
 # -----------------------------
 ARG OPENTRONS_REF=edge
 RUN git clone --depth 1 --branch ${OPENTRONS_REF} https://github.com/Opentrons/opentrons.git /root/opentrons
 
 WORKDIR /root/opentrons
-
-# robot-server setup using uv-managed python
 RUN uv run --python ${PYTHON_VERSION} make -C robot-server setup
 
 # -----------------------------
-# App user
+# App user + deps
 # -----------------------------
 RUN useradd -m -u 1000 user
 USER user
 
 ENV HOME=/home/user
-# Put uv cache in a writable location for non-root user
 ENV UV_CACHE_DIR=/home/user/.cache/uv
 
 WORKDIR $HOME/app
 RUN mkdir -p $UV_CACHE_DIR
 
-# Cache-friendly install of Python deps for your app
+# install python deps (fastapi/uvicorn含む)
 COPY --chown=user requirements.txt $HOME/app/requirements.txt
-
 RUN uv venv --python ${PYTHON_VERSION} .venv \
  && uv pip install --python .venv/bin/python -r requirements.txt
 
-# Copy the rest of your app
+# copy app code (api.py / entrypoint.sh など)
 COPY --chown=user . $HOME/app
 
 # -----------------------------
@@ -97,5 +86,7 @@ COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
 WORKDIR /root/opentrons
+ENV PORT=7860
+EXPOSE 7860
+
 ENTRYPOINT ["/bin/bash", "-lc", "/entrypoint.sh"]
-CMD ["bash"]