Modification of Dockerfile

.devcontainer/Dockerfile

@@ -1,6 +1,8 @@
 FROM debian:bookworm-slim AS builder
 
-LABEL maintainer="a5chin <[email protected]>"
+ENV CARGO_HOME="/opt/.cargo"
+
+SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
 
 WORKDIR /opt
 
@@ -9,28 +11,19 @@ WORKDIR /opt
 RUN apt-get update && \
     apt-get install -y --no-install-recommends ca-certificates curl
 
-SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
-
-# Download the latest installer
-ADD https://astral.sh/uv/install.sh uv-installer.sh
-
-# Run the installer then remove it
-RUN sh uv-installer.sh
+# Run uv installer
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh
 
 
 FROM mcr.microsoft.com/vscode/devcontainers/base:bookworm
 
-ENV CARGO_HOME="/opt/.cargo/bin"
-ENV PATH="$CARGO_HOME/:$PATH"
+LABEL maintainer="a5chin <[email protected]>"
 
+ENV CARGO_HOME="/opt/.cargo"
+ENV PATH="$CARGO_HOME/bin/:$PATH"
 ENV PYTHONUNBUFFERED=True
 ENV UV_LINK_MODE=copy
 
 WORKDIR /opt
 
-COPY --from=builder /root/.cargo/bin/uv $CARGO_HOME/uv
-COPY ./.python-version ./
-
-RUN uv python pin "$(cat .python-version)"
-
-RUN chown -R vscode $CARGO_HOME
+COPY --from=builder --chown=vscode: $CARGO_HOME $CARGO_HOME

.devcontainer/buildWithRust.Dockerfile

@@ -0,0 +1,33 @@
+FROM debian:bookworm-slim AS builder
+
+ENV CARGO_HOME="/opt/.cargo"
+ENV RUSTUP_HOME="/opt/.rustup"
+
+SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
+
+WORKDIR /opt
+
+# The installer requires curl (and certificates) to download the release archive
+# hadolint ignore=DL3008
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends ca-certificates curl
+
+# Run uv and rustup installer
+RUN curl -LsSf https://astral.sh/uv/install.sh | sh && \
+    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+
+FROM mcr.microsoft.com/vscode/devcontainers/base:bookworm
+
+LABEL maintainer="a5chin <[email protected]>"
+
+ENV CARGO_HOME="/opt/.cargo"
+ENV RUSTUP_HOME="/opt/.rustup"
+ENV PATH="$CARGO_HOME/bin/:$PATH"
+ENV PYTHONUNBUFFERED=True
+ENV UV_LINK_MODE=copy
+
+WORKDIR /opt
+
+COPY --from=builder --chown=vscode: $CARGO_HOME $CARGO_HOME
+COPY --from=builder $RUSTUP_HOME $RUSTUP_HOME

.devcontainer/devcontainer.json

@@ -37,7 +37,7 @@
             }
         }
     },
-    "postCreateCommand": "uv sync --dev",
+    "postCreateCommand": "uv python pin $(cat .python-version) && uv sync --dev",
     "postStartCommand": "uv run pre-commit install",
     "remoteUser": "vscode"
 }

.dockerignore

@@ -0,0 +1,186 @@
+# Byte-compiled / optimized / DLL files
+**/__pycache__/
+**/*.py[cod]
+**/*$py.class
+
+# C extensions
+**/*.so
+
+# Distribution / packaging
+**/.Python
+**/build/
+**/develop-eggs/
+**/dist/
+**/downloads/
+**/eggs/
+**/.eggs/
+**/lib/
+**/lib64/
+**/parts/
+**/sdist/
+**/var/
+**/wheels/
+**/share/python-wheels/
+**/*.egg-info/
+**/.installed.cfg
+**/*.egg
+**/MANIFEST
+
+# Docker
+**/compose.yml
+**/docker-compose.yml
+**/*Dockerfile
+.dockerignore
+
+# Git
+.git
+.github
+**/.gitignore
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+**/*.manifest
+**/*.spec
+
+# Installer logs
+**/pip-log.txt
+**/pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+**/htmlcov/
+**/.tox/
+**/.nox/
+**/.coverage
+**/.coverage.*
+**/.*cache
+**/nosetests.xml
+**/coverage.xml
+**/*.cover
+**/*.py,cover
+**/.hypothesis/
+**/.pytest_cache/
+**/cover/
+
+# Translations
+**/*.mo
+**/*.pot
+
+# Django stuff:
+**/*.log
+**/local_settings.py
+**/db.sqlite3
+**/db.sqlite3-journal
+
+# Flask stuff:
+**/instance/
+**/.webassets-cache
+
+# Scrapy stuff:
+**/.scrapy
+
+# Sphinx documentation
+**/docs/_build/
+
+# PyBuilder
+**/.pybuilder/
+**/target/
+
+# Jupyter Notebook
+**/.ipynb_checkpoints
+
+# IPython
+**/profile_default/
+**/ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+**/__pypackages__/
+
+# Celery stuff
+**/celerybeat-schedule
+**/celerybeat.pid
+
+# SageMath parsed files
+**/*.sage.py
+
+# Environments
+**/.env
+**/.venv
+**/env/
+**/venv/
+**/ENV/
+**/env.bak/
+**/venv.bak/
+
+# Spyder project settings
+**/.spyderproject
+**/.spyproject
+
+# Rope project settings
+**/.ropeproject
+
+# mkdocs documentation
+**/site
+
+# mypy
+**/.mypy_cache/
+**/.dmypy.json
+**/dmypy.json
+
+# Pyre type checker
+**/.pyre/
+
+# pytype static type analyzer
+**/.pytype/
+
+# Cython debug symbols
+**/cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+# VS Code
+.vscode
+.devcontainer
+
+# Custom
+.pre-commit-config.yaml
+assets
+LICENSE
+pyrightconfig.json
+README.md
+ruff.toml
+tests

.github/workflows/docker.yml

@@ -19,6 +19,30 @@ jobs:
         with:
           dockerfile: Dockerfile
 
+  lint-devcontainer:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Lint Dockerfile
+        uses: hadolint/[email protected]
+        with:
+          dockerfile: .devcontainer/Dockerfile
+
+  lint-devcontainer-with-rust:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Lint Dockerfile
+        uses: hadolint/[email protected]
+        with:
+          dockerfile: .devcontainer/Dockerfile
+
   build:
     runs-on: ubuntu-latest
 
@@ -36,15 +60,41 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./Dockerfile
+          file: Dockerfile
+          push: false
+          tags: latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  build-devcontainer:
+    runs-on: ubuntu-latest
+
+    needs: lint-devcontainer
+    if: ${{ success() }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: .devcontainer/Dockerfile
           push: false
           tags: latest
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-  devcontainer:
+  build-devcontainer-with-rust:
     runs-on: ubuntu-latest
 
+    needs: lint-devcontainer-with-rust
+    if: ${{ success() }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -56,7 +106,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./.devcontainer/Dockerfile
+          file: .devcontainer/buildWithRust.Dockerfile
           push: false
           tags: latest
           cache-from: type=gha

.github/workflows/pyright.yml

@@ -10,5 +10,11 @@ jobs:
   type-check:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+
     steps:
       - uses: jakebailey/pyright-action@v2
+        with:
+          python-version: ${{ matrix.python-version }}

.gitignore

@@ -42,7 +42,7 @@ htmlcov/
 .nox/
 .coverage
 .coverage.*
-.cache
+.*cache
 nosetests.xml
 coverage.xml
 *.cover
@@ -106,8 +106,10 @@ ipython_config.py
 #pdm.lock
 #   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
 #   in version control.
-#   https://pdm.fming.dev/#use-with-ide
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
 .pdm.toml
+.pdm-python
+.pdm-build/
 
 # PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
 __pypackages__/