January 2022 Update

.devcontainer/devcontainer.json

@@ -16,7 +16,7 @@
         "files.eol": "\n",
         "terminal.integrated.defaultProfile.linux": "zsh",
         "editor.tabSize": 2,
-        "terminal.integrated.scrollback": 32000,
+        "terminal.integrated.scrollback": 64000,
     },
     // Uncomment the next line if you want start specific services in your Docker Compose config.
     // "runServices": [],
@@ -25,7 +25,7 @@
     // Uncomment the next line to run commands after the container is created.
     //"postCreateCommand": "cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chmod 600 ~/.ssh/* && sudo chown -R $(whoami) /tf/caf && git config --global core.editor vim && pre-commit install && pre-commit autoupdate",
     "postCreateCommand": "sudo cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chown -R $(whoami):$(whoami) /tf/caf ~/.ssh && sudo chmod 400 ~/.ssh/* && git config --global core.editor vi && pre-commit install && pre-commit autoupdate",
-    "postStartCommand": "sudo cp -f /tf/rover/version.txt /tf/caf/scripts/version.txt && sudo rm -rf /tf/rover && sudo ln -s /tf/caf/scripts /tf/rover",
+    "postStartCommand": "sudo chmod 666 /var/run/docker.sock && cp -f /tf/rover/version.txt /tf/caf/scripts/version.txt && sudo rm -rf /tf/rover && sudo ln -s /tf/caf/scripts /tf/rover",
     // Add the IDs of extensions you want installed when the container is created in the array below.
     "extensions": [
         "4ops.terraform",

.devcontainer/docker-compose.yml

@@ -7,7 +7,7 @@
 version: "3.7"
 services:
   rover:
-    image: aztfmod/rover:1.0.11-2112.0723
+    image: aztfmod/rover-preview:1.1.3-2201.190325
     user: vscode
 
     labels:
@@ -28,6 +28,25 @@ services:
     # Overrides default command so things don't shut down after the process ends.
     command: /bin/sh -c "while sleep 1000; do :; done"
 
+  rover_ssh:
+    image: aztfmod/rover-preview:1.1.3-2201.190325
+    user: vscode
+
+    labels:
+      - "caf=Azure CAF"
+
+    volumes:
+      - ..:/tf/caf
+      - volume-caf-vscode:/home/vscode
+      - volume-caf-vscode-bashhistory:/commandhistory
+      - ~/.ssh:/tmp/.ssh-localhost:ro
+
+      - /var/run/docker.sock:/var/run/docker.sock
+
+    environment:
+      - HISTFILE=/commandhistory/.bash_history
+      - HISTSIZE=1000
+
 volumes:
   volume-caf-vscode:
     labels:

.env.terraform

@@ -1,3 +1,3 @@
 0.15.5
 1.0.11
-1.1.0-rc1
+1.1.3

.github/dependabot.yml

@@ -10,3 +10,7 @@ updates:
     versions:
     - 1.15.8
     - 1.16.0
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "daily"

.github/workflows/rover-preview.yml

@@ -10,23 +10,24 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    # - name: Docker Hub Login
-    #   uses: Azure/docker-login@v1
-    #   with:
-    #     # Container registry username
-    #     username: aztfmod
-    #     # Container registry password
-    #     password: ${{ secrets.docker_registry_password }}
-    #     # Container registry server url
-    #     login-server: https://index.docker.io/v1/
-    # - name: Set the rover version
-    #   run: |
-    #     echo "docker_tag=$(date +"%g%m.%d%H")" >> $GITHUB_ENV
+    - uses: actions/checkout@v2
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Docker Hub Login
+      uses: docker/login-action@v1
+      with:
+          username: aztfmod
+          password: ${{ secrets.docker_registry_password }}
+    - name: Cache Docker layers
+      uses: actions/cache@v2
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-buildx-
     - name: Build the rover
       run: |
         set -e
-        sudo docker login -u "aztfmod" -p ${{ secrets.docker_registry_password }}
         # Build the rover base image
         make dev
 

.github/workflows/rover.yml

@@ -9,23 +9,24 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    # - name: Docker Hub Login
-    #   uses: Azure/docker-login@v1
-    #   with:
-    #     # Container registry username
-    #     username: aztfmod
-    #     # Container registry password
-    #     password: ${{ secrets.docker_registry_password }}
-    #     # Container registry server url
-    #     login-server: https://index.docker.io/v1/
-    # - name: Set the rover version
-    #   run: |
-    #     echo "docker_tag=$(date +"%g%m.%d%H")" >> $GITHUB_ENV
+    - uses: actions/checkout@v2
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Docker Hub Login
+      uses: docker/login-action@v1
+      with:
+          username: aztfmod
+          password: ${{ secrets.docker_registry_password }}
+    - name: Cache Docker layers
+      uses: actions/cache@v2
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-buildx-
     - name: Build the rover
       run: |
         set -e
-        sudo docker login -u "aztfmod" -p ${{ secrets.docker_registry_password }}
         # Build the rover base image
         make github
 

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
     hooks:
     - id: docker-compose-check
   - repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: check-merge-conflict
       - id: trailing-whitespace

.vscode/settings.json

@@ -2,16 +2,26 @@
     "files.eol": "\n",
     "terminal.integrated.defaultProfile.linux": "caf (zsh)",
     "editor.tabSize": 2,
-    "terminal.integrated.scrollback": 32000,
+    "terminal.integrated.scrollback": 64000,
     "terminal.integrated.profiles.linux": {
-        "caf (rover on docker)": {
-            "path": "docker-compose",
-            "args": ["-f", "rover_on_ssh_host.yml", "run", "-e", "ROVER_RUNNER=true", "--rm", "-w", "/tf/caf" ,"rover", "/usr/bin/zsh"],
+
+        // Do not try to run this profile from a remote:dev_container
+        "caf (rover on dockerd)": {
+            "path": "zsh",
+            "args": [
+                "-c", 
+                "docker compose -f ./.devcontainer/docker-compose.yml run -e ROVER_RUNNER=true --rm -w /tf/caf rover_ssh"],
             "overrideName": true
         },
         "caf (zsh)": {
             "path": "zsh",
             "overrideName": true
         }
+    },
+    "markdownlint.config": {
+        "MD028": false,
+        "MD025": {
+            "front_matter_title": ""
+        }
     }
 }