Merge 971319a into e75b6fa

aztfmod · Sep 2, 2020 · a36bd08 · a36bd08
2 parents e75b6fa + 971319a
commit a36bd08
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 86 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@
   version: '3.7'
   services:
     rover:
-      image: aztfmod/rover:latest
+      image: aztfmod/roverdev:vnext
 
       labels:
         - "caf=Azure CAF"

diff --git a/.env b/.env
@@ -1,10 +1,10 @@
-versionTerraform=0.12.29
-versionAzureCli=2.9.1
-versionKubectl=v1.18.6
-versionGit=2.27.0
-versionTflint=v0.18.0
-versionJq=1.6
-versionDockerCompose=1.25.5
-versionAzureCafTerraform=v.0.3.1
-versionTfsec=v0.24.1
+versionTerraform=0.13.0
+versionAzureCli=2.9.1
+versionKubectl=v1.18.6
+versionGit=2.27.0
+versionTflint=v0.18.0
+versionJq=1.6
+versionDockerCompose=1.25.5
+versionAzureCafTerraform=v.0.3.1
+versionTfsec=v0.24.1
 versionTerraformDocs=v0.9.1
diff --git a/.github/workflows/vnext.yml b/.github/workflows/vnext.yml
@@ -1,77 +1,63 @@
-name: vnext
-
-on:
-  pull_request:
-    branches:
-      - vnext
-  push:
-    branches:
-      - vnext
-
-env:
-  ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
-  ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
-  ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
-  ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
-  TF_VAR_azure_devops_pat_token: ${{ secrets.TF_VAR_azure_devops_pat_token }}
-  TF_VAR_azure_devops_url_organization: ${{ secrets.TF_VAR_azure_devops_url_organization }}
-
-
-jobs:
-  build:
-
-    name: Build roverdev
-    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: Build the rover
-      run: |        
-        set -e
-        docker_tag=$(date +"%g%m.%d%H%M")
-        echo ::set-env name=docker_tag::${docker_tag}
-
-        # Build the rover base image
-        docker-compose build --build-arg versionRover="aztfmod/roverdev:$docker_tag"
-
-        docker tag rover_rover aztfmod/roverdev:$docker_tag
-        docker tag rover_rover aztfmod/roverdev:vnext
-
-        docker push aztfmod/roverdev:$docker_tag
-        docker push aztfmod/roverdev:vnext
-
-    - name: Build the rover (beta 0.13)
-      run: |        
-        set -e
-        docker_tag=vnext-13-rc1
-        
-        # Override .env variable
-        export versionTerraform="0.13.0-rc1"
-
-        # Build the rover base image
-        docker-compose build --build-arg versionRover="aztfmod/roverdev:$docker_tag"
-
-        docker tag rover_rover aztfmod/roverdev:$docker_tag
-
-        docker push aztfmod/roverdev:$docker_tag
-
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@latest
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-      with:
-        tag_name: ${{ env.docker_tag }}
-        release_name: aztfmod/roverdev:${{ env.docker_tag }}
-        draft: true
-        prerelease: false
+name: vnext
+
+on:
+  pull_request:
+    branches:
+      - vnext
+  push:
+    branches:
+      - vnext
+
+env:
+  ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
+  ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
+  ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
+  ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
+  TF_VAR_azure_devops_pat_token: ${{ secrets.TF_VAR_azure_devops_pat_token }}
+  TF_VAR_azure_devops_url_organization: ${{ secrets.TF_VAR_azure_devops_url_organization }}
+
+
+jobs:
+  build:
+
+    name: Build roverdev
+    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: Build the rover
+      run: |        
+        set -e
+        docker_tag=$(date +"%g%m.%d%H%M")
+        echo ::set-env name=docker_tag::${docker_tag}
+
+        # Build the rover base image
+        docker-compose build --build-arg versionRover="aztfmod/roverdev:$docker_tag"
+
+        docker tag rover_rover aztfmod/roverdev:$docker_tag
+        docker tag rover_rover aztfmod/roverdev:vnext
+
+        docker push aztfmod/roverdev:$docker_tag
+        docker push aztfmod/roverdev:vnext
+
+
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@latest
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+      with:
+        tag_name: ${{ env.docker_tag }}
+        release_name: aztfmod/roverdev:${{ env.docker_tag }}
+        draft: true
+        prerelease: false
         body: You can also use the latest vnext by using aztfmod/roverdev:vnext