Move env build to Dockerfile; Remove now unnecessary actions steps

Author: OCopping

.devcontainer/devcontainer.json

@@ -58,7 +58,5 @@
         "--security-opt=label=disable"
     ],
     // Mount the parent as /workspaces so we can pip install peers as editable
-    "workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces,type=bind",
-    // After the container is created, install the python project in editable form
-    "postCreateCommand": "bash ./.devcontainer/post-install.sh"
+    "workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces,type=bind"
 }

.devcontainer/post-install.sh

@@ -4,9 +4,6 @@ inputs:
   python-version:
     description: Python version to install, default is from Dockerfile
     default: "dev"
-  poetry-version:
-    description: Poetry version to install, from pyproject.toml
-    default: $(yq '.project."optional-dependencies".dev[] | select(. | contains("poetry"))' pyproject.toml | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
 
 runs:
   using: composite
@@ -20,25 +17,15 @@ runs:
         echo "PYTHON_VERSION=$PYTHON_VERSION" >> "$GITHUB_ENV"
       shell: bash
 
-    - name: Setup python
-      uses: actions/setup-python@v5
+    - name: Setup PDM
+      uses: pdm-project/setup-pdm@v4
       with:
         python-version: ${{ env.PYTHON_VERSION }}
 
-    - name: Install Poetry
-      uses: abatilo/actions-poetry@v2
-      with:
-        poetry-version: ${{ inputs.poetry-version }}
-
-    # - name: Install Poetry with specific version from pyproject.toml
-    #   uses: snok/install-poetry@v1
-    #   with:
-    #     poetry-version-from-pyproject-toml: true
-
     - name: Install dependencies
-      run: poetry install --no-root
+      run: pdm sync -d --no-root
       shell: bash
 
     - name: Report what was installed
-      run: poetry show
+      run: pdm show
       shell: bash

.github/actions/install_requirements/action.yml

@@ -10,25 +10,25 @@ RUN curl -sSL https://raw.githubusercontent.com/pdm-project/pdm/main/install-pdm
 RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq \
     && chmod +x /usr/bin/yq
 
-COPY . ./
-COPY src/phoebus_guibuilder ./phoebus_guibuilder
-RUN touch README.md
-
-# # Set up a virtual environment and put it in PATH
-# RUN python -m venv /venv
-# ENV PATH=/venv/bin:$PATH
-
 # # The build stage installs the context into the venv
-# FROM developer AS build
-# COPY . /context
-# WORKDIR /context
-# RUN touch dev-requirements.txt && pip install -c dev-requirements.txt .
+FROM developer AS build
+# install PDM
+RUN pip install -U pdm
+# disable update check
+ENV PDM_CHECK_UPDATE=false
+# copy files
+COPY pyproject.toml pdm.lock README.md /project/
+COPY src/ /project/src
+
+# install dependencies and project into the local packages directory
+WORKDIR /project
+RUN pdm install --check --prod --no-editable
 
-# # The runtime stage copies the built venv into a slim runtime container
-# FROM python:${PYTHON_VERSION}-slim AS runtime
-# # Add apt-get system dependecies for runtime here if needed
-# COPY --from=build /venv/ /venv/
-# ENV PATH=/venv/bin:$PATH
+# The runtime stage copies the built venv into a slim runtime container
+FROM python:${PYTHON_VERSION}-slim AS runtime
+# Add apt-get system dependecies for runtime here if needed
+COPY --from=builder /project/.venv/ /project/.venv
+ENV PATH="/project/.venv/bin:$PATH"
 
 # change this entrypoint if it is not the same as the repo
 ENTRYPOINT ["phoebus-guibuilder"]