sync devcontainer and CI images

OmarTawfik-forks · Nov 1, 2023 · de28feb · de28feb
1 parent de7285a
commit de28feb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -21,7 +21,7 @@
 # Base Container
 
 # _SLANG_DEV_CONTAINER_BASE_IMAGE_ (keep in sync)
-FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
+FROM mcr.microsoft.com/devcontainers/universal:2.5.8
 
 # Setup ZSH for local development inside the image:
 COPY ./scripts/ /home/vscode/
diff --git a/.github/workflows/_jobs_ci.yml b/.github/workflows/_jobs_ci.yml
@@ -6,7 +6,10 @@ on:
 
 jobs:
   run:
-    runs-on: "ubuntu-22.04" # _SLANG_DEV_CONTAINER_BASE_IMAGE_ (keep in sync)
+    # _SLANG_DEV_CONTAINER_BASE_IMAGE_ (keep in sync)
+    runs-on: "ubuntu-22.04"
+    container:
+      image: "mcr.microsoft.com/devcontainers/universal:2.5.8"
 
     steps:
       #

diff --git a/.github/workflows/_jobs_github_pages.yml b/.github/workflows/_jobs_github_pages.yml
@@ -10,7 +10,10 @@ on:
 
 jobs:
   run:
-    runs-on: "ubuntu-22.04" # _SLANG_DEV_CONTAINER_BASE_IMAGE_ (keep in sync)
+    # _SLANG_DEV_CONTAINER_BASE_IMAGE_ (keep in sync)
+    runs-on: "ubuntu-22.04"
+    container:
+      image: "mcr.microsoft.com/devcontainers/universal:2.5.8"
 
     environment:
       name: "github-pages"

diff --git a/.github/workflows/_jobs_publish.yml b/.github/workflows/_jobs_publish.yml
@@ -10,7 +10,10 @@ on:
 
 jobs:
   changesets:
-    runs-on: "ubuntu-22.04" # _SLANG_DEV_CONTAINER_BASE_IMAGE_ (keep in sync)
+    # _SLANG_DEV_CONTAINER_BASE_IMAGE_ (keep in sync)
+    runs-on: "ubuntu-22.04"
+    container:
+      image: "mcr.microsoft.com/devcontainers/universal:2.5.8"
 
     steps:
       #
@@ -54,9 +57,12 @@ jobs:
       hasChangesets: "${{ steps.changesets.outputs.hasChangesets }}"
 
   assets:
-    needs: "changesets"
-    runs-on: "ubuntu-22.04" # _SLANG_DEV_CONTAINER_BASE_IMAGE_ (keep in sync)
+    # _SLANG_DEV_CONTAINER_BASE_IMAGE_ (keep in sync)
+    runs-on: "ubuntu-22.04"
+    container:
+      image: "mcr.microsoft.com/devcontainers/universal:2.5.8"
 
+    needs: "changesets"
     if: "${{ needs.changesets.outputs.hasChangesets == 'false' }}"
 
     steps: