Merge branch 'main' of https://github.com/microsoft/vscode-dev-containers into dotnetmssql-removesetecho

Author: dzsquared

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,14 +6,15 @@ about: Create a report to help us improve
 <!--  🚨 Please only include bugs related to Dev Container Definitions here. 🚨 Other locations:
         VS Code Remote Development: http://github.com/Microsoft/vscode-remote-release 
         VS Code OSS: http://github.com/Microsoft/vscode
-        GitHub Codespaces: https://github.community/c/codespaces-beta
+        GitHub Codespaces: https://github.com/github/feedback/discussions/categories/codespaces-feedback
 -->
 
 <!-- Please search existing issues to avoid creating duplicates. -->
 <!-- Also please test using the latest insiders build to make sure your issue has not already been fixed: https://code.visualstudio.com/insiders/ -->
 
 - VSCode Version:
 - Local OS Version:
+- Reproduces in: <Codespaces | Remote - Containers | Both>
 - Name of Dev Container Definition with Issue:
 
 Steps to Reproduce:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,7 +7,9 @@ about: Suggest an idea for this project
 <!--  🚨 Please only include feature requests related to Dev Container Definitions here. 🚨 Other locations:
         VS Code Remote Development: http://github.com/Microsoft/vscode-remote-release 
         VS Code OSS: http://github.com/Microsoft/vscode
-        GitHub Codespaces: https://github.community/c/codespaces-beta
+        GitHub Codespaces: https://github.com/github/feedback/discussions/categories/codespaces-feedback
 -->
 
-<!-- Describe the feature request -->
+<!-- Describe the feature request -->
+
+Relates to: <Codespaces | Remote - Containers | Both>

.github/ISSUE_TEMPLATE/question.md

@@ -1,11 +1,10 @@
 ---
 name: Question
-about: Please ask questions on https://stackoverflow.com/questions/tagged/visual-studio-code or https://github.community/c/codespaces-beta
+about: Please ask questions on https://stackoverflow.com/questions/tagged/visual-studio-code or https://github.com/github/feedback/discussions/categories/codespaces-feedback
 
 
 ---
 
 🚨 The issue tracker is not for questions 🚨
 
-If you have a question, please ask it on https://stackoverflow.com/questions/tagged/visual-studio-code or for GitHub Codespaces https://github.community/c/codespaces-beta
-
+If you have a question, please ask it on https://stackoverflow.com/questions/tagged/visual-studio-code or for GitHub Codespaces https://github.com/github/feedback/discussions/categories/codespaces-feedback

.github/workflows/cgmanifest.yml

@@ -1,9 +1,9 @@
 name: Run Patches
 
 on: 
-  #repository_dispatch:
+  workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths:
       - 'build/patch/**'
 

.github/workflows/patch.yml

@@ -138,3 +138,27 @@ jobs:
         asset_path: ./${{ steps.package.outputs.package_name }}
         asset_name: ${{ steps.package.outputs.package_name }}
         asset_content_type: application/gzip 
+
+  image-info:
+    name: Trigger info extraction
+    if: "!contains(github.event.head_commit.message, 'Automated update') && !contains(github.event.head_commit.message, 'CI ignore')"
+    needs: [package]
+    runs-on: ubuntu-latest
+    steps:
+    - name: Get tag name
+      id: get_tag_name
+      run: echo "::set-output name=tag::$(echo "${{ github.ref }}" | grep -oP 'refs/tags/\K(.+)')"
+      
+    - name: Trigger image info file generation 
+      id: image-info
+      run: |
+        set -e
+        echo '(*) Triggering CG manifest and image history generation using workflow_dispatch'
+
+        # Use alternate GitHub token due to https://github.community/t5/GitHub-Actions/Triggering-a-new-workflow-from-another-workflow/td-p/31676
+        curl -X POST \
+          -H "Authorization: token ${{ secrets.ALTERNATE_GITHUB_TOKEN }}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          -H "Content-Type: application/json" \
+          https://api.github.com/repos/${{ github.repository }}/actions/workflows/version-history.yml/dispatches \
+          --data "{\"ref\": \"main\", \"inputs\": {\"release\": \"${{ steps.get_tag_name.outputs.tag }}\", \"cg\": \"false\", \"push\": \"true\", \"overwrite\": \"false\"}"

.github/workflows/push-and-package.yml

@@ -1,21 +1,16 @@
 name: Build and push "dev" for universal image
 
 on: 
-  #repository_dispatch:
+  workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths:
       - 'containers/codespaces-linux/**'
-      - 'containers/codespaces-linux-stretch/**'
 
 jobs:
   build-and-push:
     name: Build and push universal image
     if: "!contains(github.event.head_commit.message, 'Automated update') && !contains(github.event.head_commit.message, 'CI ignore')"
-    strategy:
-      matrix:
-        definitionId: ["codespaces-linux", "codespaces-linux-stretch"]
-      fail-fast: true
     runs-on: ubuntu-latest
     steps:
     - name: Free more space
@@ -50,9 +45,9 @@ jobs:
         yarn install
         GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
         if [ "$GIT_BRANCH" == "" ]; then 
-            GIT_BRANCH=master
+            GIT_BRANCH=main
         fi
-        build/vscdc push  ${{ matrix.definitionId }} \
+        build/vscdc push  codespaces-linux \
                           --release $GIT_BRANCH \
                           --github-repo ${{ github.repository }} \
                           --registry ${{ secrets.REGISTRY }} \

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

@@ -1,14 +1,14 @@
 name: Build and push "dev" images
 
 on: 
-  #repository_dispatch:
+  workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths:
       - 'containers/alpine/**'
       - 'containers/debian/**'
       - 'containers/cpp/**'
-      - 'containers/dotnetcore/**'
+      - 'containers/dotnet/**'
       - 'containers/go/**'
       - 'containers/java/**'
       - 'containers/java-8/**'
@@ -17,6 +17,7 @@ on:
       - 'containers/python-3/**'
       - 'containers/python-3-anaconda/**'
       - 'containers/python-3-miniconda/**'
+      - 'containers/jekyll/**'
       - 'containers/ruby/**'
       - 'containers/rust/**'
       - 'containers/typescript-node/**'
@@ -66,7 +67,7 @@ jobs:
         yarn install
         GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
         if [ "$GIT_BRANCH" == "" ]; then 
-            GIT_BRANCH=master
+            GIT_BRANCH=main
         fi
         build/vscdc push  --page ${{ matrix.page }} \
                           --pageTotal ${{ matrix.page-total }} \
@@ -95,7 +96,7 @@ jobs:
         yarn install
         GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
         if [ "$GIT_BRANCH" == "" ]; then 
-            GIT_BRANCH=master
+            GIT_BRANCH=main
         fi
         build/vscdc pack  --prep-and-package-only \
                           --release $GIT_BRANCH \
@@ -117,23 +118,26 @@ jobs:
         name: ${{ steps.package.outputs.package_name }}
         path: ./${{ steps.package.outputs.package_name }}
 
-  cgmanifest:
-    name: Trigger CG generation
+  image-info:
+    name: Trigger info extraction
     if: "!contains(github.event.head_commit.message, 'Automated update') && !contains(github.event.head_commit.message, 'CI ignore')"
     needs: [package]
     runs-on: ubuntu-latest
     steps:
-    - name: Trigger CG generation 
-      id: cgmanifest
+    - name: Trigger image info file generation 
+      id: image-info
       run: |
         set -e
-        echo '(*) Triggering CG manifest generation using repository_dispatch'
-
+        echo '(*) Triggering CG manifest and image history generation using workflow_dispatch'
+        GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
+        if [ "$GIT_BRANCH" == "" ]; then 
+            GIT_BRANCH=main
+        fi
         # Use alternate GitHub token due to https://github.community/t5/GitHub-Actions/Triggering-a-new-workflow-from-another-workflow/td-p/31676
         curl -X POST \
           -H "Authorization: token ${{ secrets.ALTERNATE_GITHUB_TOKEN }}" \
-          -H "Accept: application/vnd.github.everest-preview+json" \
+          -H "Accept: application/vnd.github.v3+json" \
           -H "Content-Type: application/json" \
-          https://api.github.com/repos/${{ github.repository }}/dispatches \
-          --data '{"event_type":"oss_cg_trigger"}'
+          https://api.github.com/repos/${{ github.repository }}/actions/workflows/version-history.yml/dispatches \
+          --data "{\"ref\": \"${{ github.ref }}\", \"inputs\": {\"release\": \"$GIT_BRANCH\", \"cg\": \"true\", \"push\": \"true\", \"overwrite\": \"true\"}"
 

.github/workflows/push-dev.yml

@@ -1,9 +1,9 @@
 name: Test script library and update definitions
 
 on: 
-  #repository_dispatch:
+  workflow_dispatch:
   push:
-    branches: [master]
+    branches: [main]
     paths:
       - 'script-library/**'
 
@@ -13,7 +13,7 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'Automated update') && !contains(github.event.head_commit.message, 'CI ignore')"
     strategy:
       matrix:
-        os: [debian, alpine, redhat]
+        os: [debian, ubuntu, alpine, centos]
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
@@ -30,17 +30,15 @@ jobs:
       id: checkout
       uses: actions/checkout@v1
 
+    - name: Setup buildx
+      uses: docker/setup-buildx-action@a1c666d855a037f439ebb7bf701ee144fcadd307
+      id: buildx
+
     - name: Test script library
       id: test_script_library
       run: |
         set -e
-        cd script-library
-        if [ "${{ matrix.os }}" = "redhat" ]; then
-          IMAGE_TO_TEST="centos:7"
-        else
-          IMAGE_TO_TEST=${{ matrix.os }}
-        fi
-        docker build --build-arg DISTRO=${{ matrix.os }} --build-arg IMAGE_TO_TEST=$IMAGE_TO_TEST -f test/Dockerfile .
+        bash script-library/test/regression/test.sh "${{ matrix.os }}"
 
   copy-scripts:
     name: Copy and commit script-library updates