Merge branch 'main' into removepythonsettings

.github/actions/smoke-test/action.yaml

@@ -10,7 +10,7 @@ runs:
   steps:
     - name: Checkout main
       id: checkout_release
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: 'devcontainers/images'
         path: '__build'

.github/workflows/push-again.yml

@@ -28,14 +28,14 @@ jobs:
 
     - name: Checkout ref
       id: checkout_ref
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: 'ref'
         ref: ${{ github.ref }}
 
     - name: Checkout release
       id: checkout_release
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: 'release'
         ref: ${{ github.event.inputs.release }}

.github/workflows/push-dev.yml

@@ -27,7 +27,7 @@ jobs:
 
     - name: Checkout
       id: checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
 
     - name: Azure CLI login
       id: az_login

.github/workflows/push-manual-dev.yml

@@ -0,0 +1,78 @@
+name: Manually build and push dev images
+
+on:
+  workflow_dispatch:
+    inputs:
+      image:
+        description: 'Image ID'
+        required: true
+
+jobs:
+  build-and-push:
+    name: Build and push images
+    if: ${{ startsWith(github.ref, 'refs/heads/') }}
+    runs-on: devcontainer-image-builder-ubuntu
+    steps:
+    - name: Free more space
+      id: free_space 
+      run: |
+        set -e
+        # Ensure enough space is available for build
+        sudo apt-get autoremove -y
+        sudo apt-get clean -y
+        sudo rm -rf /usr/share/dotnet
+
+    - name: Checkout ref
+      id: checkout_ref
+      uses: actions/checkout@v3
+      with:
+        path: 'ref'
+        ref: ${{ github.ref }}
+
+    - name: Checkout release
+      id: checkout_release
+      uses: actions/checkout@v3
+      with:
+        path: 'release'
+        ref: ${{ github.event.inputs.release }}
+
+    - name: Azure CLI login
+      id: az_login
+      uses: azure/login@v1
+      with:
+        creds: ${{ secrets.AZ_ACR_CREDS }}
+
+    - name: Build and push
+      id: build_and_push
+      env:
+        REGISTRY: ${{ secrets.REGISTRY }}
+        REGISTRY_BASE_PATH: ${{ secrets.REGISTRY_BASE_PATH }}
+        STUB_REGISTRY: ${{ secrets.STUB_REGISTRY }}
+        STUB_REGISTRY_BASE_PATH: ${{ secrets.STUB_REGISTRY_BASE_PATH }}
+        SECONDARY_REGISTRY_BASE_PATH: ${{ secrets.SECONDARY_REGISTRY_BASE_PATH }}
+      run: |
+        set -e
+
+        # ACR login
+        ACR_REGISTRY_NAME=$(echo "$REGISTRY" | grep -oP '(.+)(?=\.azurecr\.io)')
+        az acr login --name $ACR_REGISTRY_NAME
+
+        # Setup build CLI
+        cd "$GITHUB_WORKSPACE/ref"
+        yarn install
+        npm install -g @devcontainers/cli
+
+        # Go to the release, symlink the build tool from ref since this is the version for the workflow
+        cd "$GITHUB_WORKSPACE/release"
+        rm -rf build node_modules
+        ln -s "$GITHUB_WORKSPACE/ref/build" build
+        ln -s "$GITHUB_WORKSPACE/ref/node_modules" node_modules
+
+        build/vscdc push  --replace-images \
+                          --release main \
+                          --registry "$REGISTRY" \
+                          --registry-path "$REGISTRY_BASE_PATH" \
+                          --stub-registry "$STUB_REGISTRY" \
+                          --stub-registry-path "$STUB_REGISTRY_BASE_PATH" \
+                          --secondary-registry-path "$SECONDARY_REGISTRY_BASE_PATH" \
+                          ${{ github.event.inputs.image }}

.github/workflows/push.yml

@@ -27,7 +27,7 @@ jobs:
 
     - name: Checkout
       id: checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
 
     - name: Get tag name
       id: get_tag_name  

.github/workflows/smoke-universal.yaml

@@ -14,7 +14,7 @@ on:
 jobs:
   smoke-test:
     name: Smoke test
-    runs-on: ubuntu-latest
+    runs-on: devcontainer-image-builder-ubuntu
     steps:
     - name: Checkout
       id: checkout

.github/workflows/version-history.yml

@@ -46,7 +46,7 @@ jobs:
 
     - name: Checkout
       id: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Azure CLI login
       id: az_login

build/config.json

@@ -226,7 +226,7 @@
 			"downloadUrl":"https://xdebug.org/"
 		},
 		"Java": {
-			"versionCommand": "java --version | grep -oP 'openjdk\\s+\\K[0-9]+\\.[0-9]+\\.[0-9]+'",
+			"versionCommand": "java --version | grep -oP 'openjdk\\s+\\K[0-9]+\\.[0-9]+\\.[0-9]+|[0-9]{2}' | head -n 1",
 			"downloadUrl": "https://adoptopenjdk.net/"
 		},
 		".NET": {