Update devcontainer setup (#246)

* Update devcontainer setup

* using ruff instead of black extension

Author: Ckk3

.devcontainer/Dockerfile

@@ -1,29 +1,38 @@
 ARG VARIANT=3.8
 FROM mcr.microsoft.com/vscode/devcontainers/python:${VARIANT}
 
+
+# Install Poetry and pre-commit
 RUN pip3 install poetry pre-commit
-RUN poetry config virtualenvs.in-project true
+
 ARG PGVERSION=14
+ARG TARGETPLATFORM
 
-# Setup apt repo for Postgres
-RUN if [ "${PGVERSION}" != "none"  ]; then \
-    echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main"  \
-    | tee /etc/apt/sources.list.d/pgdg.list \
-    && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+# Setup Postgres repo and install packages
+
+# Add PostgreSQL APT repository and key (only if PGVERSION is not "none")
+RUN if [ "${PGVERSION}" != "none" ]; then \
+    echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" \
+    > /etc/apt/sources.list.d/pgdg.list && \
+    curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
     | gpg --dearmor --yes -o /usr/share/keyrings/postgresql.gpg; \
     fi
 
-# Install Postgres packages
-ARG TARGETPLATFORM
+# Install PostgreSQL packages using APT cache mount
 RUN --mount=type=cache,target=/var/cache/apt,id=apt-${TARGETPLATFORM} \
-    export DEBIAN_FRONTEND=noninteractive \
-    && export PGPACKAGES=$(if [ "${PGVERSION}" != "none" ]; then echo "postgresql-${PGVERSION} postgresql-client-${PGVERSION} postgresql-server-dev-${PGVERSION}"; fi) \
-    && apt-get remove man-db --purge -y \
-    && apt-get update \
-    && apt-get -y install --no-install-recommends ${PGPACKAGES}
+    if [ "${PGVERSION}" != "none" ]; then \
+    apt-get update && \
+    apt-get -y install --no-install-recommends \
+    postgresql-${PGVERSION} \
+    postgresql-client-${PGVERSION} \
+    postgresql-server-dev-${PGVERSION} && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*; \
+    fi
 
-# Trust postgres connections from localhost and local port.
-RUN if [ "$PGVERSION" != "none" ]; then \
-        sed -i -E 's/local(\s+)all(\s+)postgres(\s+)peer/local\1all\2all\3trust/g' /etc/postgresql/${PGVERSION}/main/pg_hba.conf && \
-        sed -i -E 's/host(\s+)all(\s+)all(\s+)(\S+)(\s+)(\S+)/host\1all\2all\3\4\5trust/g' /etc/postgresql/${PGVERSION}/main/pg_hba.conf; \
+# Configure Postgres to trust local connections
+RUN if [ "${PGVERSION}" != "none" ]; then \
+    sed -i -E 's/local(\s+)all(\s+)postgres(\s+)peer/local\1all\2all\3trust/g' \
+    /etc/postgresql/${PGVERSION}/main/pg_hba.conf && \
+    sed -i -E 's/host(\s+)all(\s+)all(\s+)(\S+)(\s+)(\S+)/host\1all\2all\3\4\5trust/g' \
+    /etc/postgresql/${PGVERSION}/main/pg_hba.conf; \
     fi

.devcontainer/devcontainer.json

@@ -1,27 +1,37 @@
 {
   "name": "Strawberry Sqlalchemy Mapper",
-  "context": "..",
   "build": {
-    "dockerfile": "Dockerfile"
+    "dockerfile": "Dockerfile",
+    "context": ".."
   },
-
-  "settings": {
-    "terminal.integrated.shell.linux": "/bin/bash",
-    "python.pythonPath": "/usr/local/bin/python",
-    "python.linting.enabled": true,
-    "python.linting.pylintEnabled": true,
-    "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-    "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-    "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-    "python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-    "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-    "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-    "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-    "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-    "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.shell.linux": "/bin/bash",
+        "python.terminal.activateEnvironment": true,
+        "python.pythonPath": "${workspaceFolder}/.venv/bin/python",
+        "python.linting.enabled": true,
+        "python.linting.pylintEnabled": false,
+        "python.linting.mypyEnabled": true,
+        "[python]": {
+          "editor.defaultFormatter": "charliermarsh.ruff"
+        },
+        "python.formatting.provider": "black",
+        "python.formatting.blackPath": "${workspaceFolder}/.venv/bin/black",
+        "python.linting.mypyPath": "${workspaceFolder}/.venv/bin/mypy"
+      },
+      "extensions": [
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+        "ms-azuretools.vscode-docker",
+        "eamodio.gitlens",
+        "charliermarsh.ruff",
+        // Dont install these extensions because they conflict with black lint
+        "-dbaeumer.vscode-eslint",
+        "-ms-python.autopep8"
+      ]
+    }
   },
-
-  "extensions": ["ms-python.python", "ms-python.vscode-pylance", "eamodio.gitlens"],
-  "postCreateCommand": "sh ./.devcontainer/post-install.sh",
-  "postStartCommand": "sh ./.devcontainer/post-start.sh",
+  "postCreateCommand": "chmod +x ./.devcontainer/post-install.sh && ./.devcontainer/post-install.sh",
+  "postStartCommand": "chmod +x ./.devcontainer/post-start.sh && ./.devcontainer/post-start.sh"
 }

.devcontainer/post-install.sh

@@ -1,2 +1,10 @@
-poetry install
+#!/bin/bash
+set -e  # Exit on error
+
+echo "📦 Installing Python dependencies with Poetry..."
+poetry config virtualenvs.in-project true
+poetry install --no-cache
+
+echo "🔧 Setting up pre-commit hooks..."
+
 pre-commit install --install-hooks

.devcontainer/post-start.sh

@@ -1,6 +1,10 @@
-service postgresql status
-if [ "$?" -eq "1" ]; then
-  echo "Postgres not installed. Postgres integration tests will fail for now."
-else
+#!/bin/bash
+
+echo "🔍 Checking PostgreSQL service status..."
+if ! pg_isready > /dev/null 2>&1; then
+  echo "⚠️  PostgreSQL is not ready. Starting the service..."
   sudo service postgresql start
+  echo "✅ PostgreSQL running."
+else
+  echo "✅ PostgreSQL is already running."
 fi