Fix Dockerfile and update workflow to read the rust version

Signed-off-by: Doru Blânzeanu <[email protected]>

Author: dblnz

.devcontainer/Dockerfile

@@ -4,7 +4,6 @@ FROM mcr.microsoft.com/devcontainers/base:debian AS base
 
 ARG USER=vscode
 ARG GROUP=vscode
-ARG RUST_TOOLCHAIN=1.81.0
 
 ENV HOME="/home/${USER}"
 ENV PATH="$HOME/.cargo/bin:$PATH"
@@ -23,16 +22,18 @@ RUN apt-get update \
         sudo \
         wget
 
+ARG LLVM_VERSION=17
+
 # Install llvm
 RUN wget https://apt.llvm.org/llvm.sh \
     && chmod +x ./llvm.sh         \
-    && sudo ./llvm.sh 17 all      \
-    && sudo ln -s /usr/lib/llvm-17/bin/clang-cl /usr/bin/clang-cl \
-    && sudo ln -s /usr/lib/llvm-17/bin/llvm-lib /usr/bin/llvm-lib \
-    && sudo ln -s /usr/lib/llvm-17/bin/lld-link /usr/bin/lld-link \
-    && sudo ln -s /usr/lib/llvm-17/bin/llvm-ml /usr/bin/llvm-ml   \
-    && sudo ln -s /usr/lib/llvm-17/bin/ld.lld /usr/bin/ld.lld     \
-    && sudo ln -s /usr/lib/llvm-17/bin/clang /usr/bin/clang
+    && sudo ./llvm.sh ${LLVM_VERSION} all      \
+    && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/clang-cl /usr/bin/clang-cl \
+    && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/llvm-lib /usr/bin/llvm-lib \
+    && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/lld-link /usr/bin/lld-link \
+    && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/llvm-ml /usr/bin/llvm-ml   \
+    && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/ld.lld /usr/bin/ld.lld     \
+    && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/clang /usr/bin/clang
 
 FROM base AS dev
 
@@ -49,6 +50,8 @@ RUN SNIPPET="export PROMPT_COMMAND='history -a' && export HISTFILE=/commandhisto
 
 USER $USER
 
+ARG RUST_TOOLCHAIN=1.81.0
+
 # Install rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
     && rustup default ${RUST_TOOLCHAIN} \

.devcontainer/devcontainer.json

@@ -8,9 +8,10 @@
   "containerUser": "vscode",
   // Environment for the container also used by in the `postCreateCommand`
   "containerEnv": {
+    "DEVICE": "/dev/kvm",
+    "KVM_SHOULD_BE_PRESENT": "true",
     "REMOTE_USER": "vscode",
-    "REMOTE_GROUP": "vscode",
-    "DEVICE": "/dev/kvm"
+    "REMOTE_GROUP": "vscode"
   },
 
   "runArgs": [
@@ -24,7 +25,8 @@
     "vscode": {
       "extensions": [
         "ms-vscode.cmake-tools",
-        "rust-lang.rust-analyzer"
+        "rust-lang.rust-analyzer",
+        "vadimcn.vscode-lldb"
       ]
     }
   }

.github/workflows/CreateDevcontainerImage.yml

@@ -2,17 +2,22 @@ name: Create and publish devcontainer Docker image
 
 on:
   push:
+    branches:
+      - "main"
     paths:
       - ".devcontainer/Dockerfile"
       - ".github/workflows/CreateDevcontainerImage.yml"
+      - "rust-toolchain.toml"
 
 # Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}-devcontainer
   USER: vscode
   GROUP: vscode
-  RUST_TOOLCHAIN: 1.81.0
+  LLVM_VERSION: 17
+  RUST_TOOLCHAIN_DEFAULT: 1.81.0
+  RUST_TOOLCHAIN_FILE: rust-toolchain.toml
 
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
@@ -29,6 +34,15 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
       # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
+
+      - name: Read Rust toolchain version from ${{ env.RUST_TOOLCHAIN_FILE }}
+        id: toolchain
+        run: |
+          version=$(cat ${{ env.RUST_TOOLCHAIN_FILE }} | sed -n '/\[toolchain\]/,/^\[/{/^\s*channel = /s/[^"]*"\([^"]*\)".*/\1/p}')
+          cat ${{ env.RUST_TOOLCHAIN_FILE }} | grep $version &> /dev/null \
+            && echo "RUST_TOOLCHAIN=${version}" >> "$GITHUB_OUTPUT" \
+            || echo "RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN_FILE }}" >> "$GITHUB_OUTPUT"
+        
       - name: Log in to the Container registry
         uses: docker/login-action@v1
         with:
@@ -55,4 +69,5 @@ jobs:
           build-args: |
             USER=${{ env.USER }}
             GROUP=${{ env.GROUP }}
-            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
+            LLVM_VERSION=${{ env.LLVM_VERSION }}
+            RUST_TOOLCHAIN=${{ steps.toolchain.outputs.RUST_TOOLCHAIN }}