Merge pull request #3 from zedy-wj/addNewFeature

Updating/work-with this template for GHA and Azd Devcontainer feature.
sjkp · Oct 8, 2023 · 4bf8068 · 4bf8068
2 parents 86e4ca5 + efbdf83
commit 4bf8068
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,11 +1,6 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "VARIANT": "bullseye"
-        }
-    },
+    "image": "mcr.microsoft.com/vscode/devcontainers/base:0-bullseye",
     "features": {
         "github-cli": "2",
         "azure-cli": "2.38",
@@ -14,7 +9,8 @@
         "node": {
             "version": "16",
             "nodeGypDependencies": false
-        }
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "extensions": [
         "ms-azuretools.azure-dev",

diff --git a/.github/workflows/azure-dev.yml b/.github/workflows/azure-dev.yml
@@ -12,12 +12,13 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container:
-      image: mcr.microsoft.com/azure-dev-cli-apps:latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Install azd
+        uses: Azure/setup-azd@v0.1.0
+
       - name: Log in with Azure
         uses: azure/login@v1
         with: