Merge branch 'main' into user-guide

Author: Gary-H9

.devcontainer/devcontainer-lock.json

@@ -1,9 +1,9 @@
 {
   "features": {
     "ghcr.io/devcontainers/features/docker-in-docker:2": {
-      "version": "2.10.2",
-      "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:23ae11a86089da5f0b98a6edd603f91831802b7f2d5ef1e104e1b94a3beb546c",
-      "integrity": "sha256:23ae11a86089da5f0b98a6edd603f91831802b7f2d5ef1e104e1b94a3beb546c"
+      "version": "2.11.0",
+      "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:503f23cd692325b3cbb8c20a0ecfabb3444b0c786b363e0c82572bd7d71dc099",
+      "integrity": "sha256:503f23cd692325b3cbb8c20a0ecfabb3444b0c786b363e0c82572bd7d71dc099"
     },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "1.4.1",

.github/workflows/super-linter.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Super-Linter
         id: super_linter
-        uses: super-linter/super-linter/slim@4758be622215d0954c8353ee4877ffd60111cf8e # v6.4.1
+        uses: super-linter/super-linter/slim@56576d491db07c7236b445ab09991ca49d12b0c6 # v6.5.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DEFAULT_BRANCH: main

images/base/CHANGELOG.md

@@ -8,6 +8,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0] - 2024-05-13
+
+### Changed
+
+- Updated image to Ubuntu 24.04
+- Updated references to `1000`, `vscode` user is now `1001`
+
 ## [1.0.0] - 2024-04-16
 
 ### Changed

images/base/Dockerfile

@@ -2,7 +2,7 @@
 #checkov:skip=CKV_DOCKER_3: USER not required - A non-root user is created, and used by VS Code's Remote Containers extension
 # hadolint global ignore=DL3008,DL3013
 
-FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
+FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04
 
 LABEL org.opencontainers.image.vendor="Ministry of Justice" \
       org.opencontainers.image.authors="Dev Container Community" \
@@ -22,16 +22,13 @@ apt-get update --yes
 
 apt-get upgrade --yes
 
-apt-get install --yes --no-install-recommends \
+apt-get install --yes \
   python3-pip
 
 apt-get clean --yes
 
 rm --force --recursive /var/lib/apt/lists/*
 
-python3 -m pip install --no-cache-dir --upgrade \
-  pip
-
 chsh --shell "$(which zsh)" vscode
 
 cat /home/vscode/.zshrc.snippet >> /home/vscode/.zshrc
@@ -56,7 +53,4 @@ apt-get upgrade --yes
 apt-get clean --yes
 
 rm --force --recursive /var/lib/apt/lists/*
-
-python3 -m pip install --no-cache-dir --upgrade \
-  pip
 EOF

images/base/config.json

@@ -1,4 +1,4 @@
 {
   "name": "base",
-  "version": "1.0.0"
+  "version": "2.0.0"
 }

images/base/src/usr/local/bin/devcontainer-utils

@@ -77,5 +77,5 @@ apt_install() {
 pip_install() {
   local packages="${1}"
 
-  python3 -m pip install --no-cache-dir --upgrade "${packages}"
+  python3 -m pip install --no-cache-dir --upgrade --break-system-packages "${packages}"
 }

images/base/test/container-structure-test.yml

@@ -5,17 +5,17 @@ commandTests:
   - name: "vscode user"
     command: "id"
     args: ["--user", "vscode"]
-    expectedOutput: ["1000"]
+    expectedOutput: ["1001"]
 
   - name: "vscode group"
     command: "id"
     args: ["--group", "vscode"]
-    expectedOutput: ["1000"]
+    expectedOutput: ["1001"]
 
   - name: "vscode user getent"
     command: "getent"
     args: ["passwd", "vscode" ]
-    expectedOutput: ["vscode:x:1000:1000::/home/vscode:/usr/bin/zsh"]
+    expectedOutput: ["vscode:x:1001:1001::/home/vscode:/usr/bin/zsh"]
 
   - name: "pip"
     command: "pip"
@@ -41,22 +41,22 @@ fileExistenceTests:
     path: "/home/vscode/.oh-my-zsh/custom/themes/devcontainers.zsh-theme"
     shouldExist: true
     permissions: "-rwxr-xr-x" # 0755
-    uid: 1000
-    gid: 1000
+    uid: 1001
+    gid: 1001
 
   - name: "featurerc.d"
     path: "/home/vscode/.devcontainer/featurerc.d"
     shouldExist: true
     permissions: "drwxr-xr-x" # 0755
-    uid: 1000
-    gid: 1000
+    uid: 1001
+    gid: 1001
 
   - name: "promptrc.d"
     path: "/home/vscode/.devcontainer/promptrc.d"
     shouldExist: true
     permissions: "drwxr-xr-x" # 0755
-    uid: 1000
-    gid: 1000
+    uid: 1001
+    gid: 1001
 
 fileContentTests:
   - name: "zshrc featurerc.d"