Merge pull request #59 from stuartleeks/sl/use-devcontainer-build-run-action

Convert to devcontainer-build-run action

Author: stuartleeks

.devcontainer/devcontainer.json

@@ -14,14 +14,8 @@
 
 		// Mount go mod cache
 		"-v", "devcontainer-cli-gomodcache:/go/pkg",
-		// Keep command history 
-		"-v", "devcontainer-cli-bashhistory:/root/commandhistory",
-		// Mount docker socket for docker builds
-		"-v", "/var/run/docker.sock:/var/run/docker.sock",
 		// Use host network
 		"--network=host",
-		// Mount azure, git and docker config
-		"-v", "${env:HOME}${env:USERPROFILE}/.azure:/root/.azure"
 	],
 
 	// Set *default* container specific settings.json values on container create.
@@ -63,9 +57,15 @@
 	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode",
 	"mounts": [
+		// Keep command history
+		"source=devcontainer-cli-bashhistory,target=/home/vscode/commandhistory",
 		// Mounts the .config/gh host folder into the dev container to pick up host gh CLI login details
 		// NOTE that mounting directly to ~/.config/gh makes ~/.config only root-writable
 		// Instead monut to another location and symlink in Dockerfile
 		"type=bind,source=${env:HOME}${env:USERPROFILE}/.config/gh,target=/config/gh",
+		// Mounts the .azure host folder into the dev container to pick up host az CLI login details
+		"type=bind,source=${env:HOME}${env:USERPROFILE}/.azure,target=/home/vscode/.azure",
+		// Mount host docker socket
+		"type=bind,source=/var/run/docker.sock,target=/var/run/docker.sock",
 	],
 }

.github/workflows/build-and-release.yaml

@@ -19,17 +19,31 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: CI Tooling
-      run: sudo apt update && sudo apt install build-essential -y
-    
-    - name: Build devcontainer for tooling
-      run: sudo -E make devcontainer
+    - name: Set up Docker BuildKit
+      uses: docker/setup-buildx-action@v1
 
-    - name: Run the release
-      run: sudo -E make devcontainer-release
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v1 
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build and run CLI
+      uses: stuartleeks/devcontainer-build-run@v0.1-alpha
       env:
         GITHUB_TOKEN: ${{ secrets.GH_CROSS_REPO_TOKEN }}
         BUILD_NUMBER: ${{ github.run_id }}
-        IS_CI: 1
         IS_PR: ${{ github.head_ref }}
         BRANCH: ${{ github.ref }}
+      with:
+        imageName: ghcr.io/stuartleeks/devcontainer-cli-devcontainer
+        runCmd: |
+          sudo chown -R $(whoami) /go/pkg
+          ./scripts/ci_release.sh
+        env: |
+          GITHUB_TOKEN
+          BUILD_NUMBER
+          IS_CI=1
+          IS_PR
+          BRANCH