Merge branch 'master' into release

theohbrothers · Sep 12, 2021 · ebcaba1 · ebcaba1
2 parents 4ec42f9 + 3300567
commit ebcaba1
Show file tree

Hide file tree

Showing 29 changed files with 541 additions and 154 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,5 +1,6 @@
-name-template: 'v$RESOLVED_VERSION  🌈'
-tag-template: 'v$RESOLVED_VERSION'
+# For Generate-DockerImageVariants: For CalVer releases. Each push to 'release' branch is a time-based release.
+name-template: '$RESOLVED_VERSION  🌈'
+tag-template: '$RESOLVED_VERSION'
 categories:
   - title: '🚀 Features'
     labels:

diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
@@ -141,12 +141,12 @@ jobs:
       run: docker logout
       if: always()
 
-  build-v1-22-0-envsubst-git-jq-kustomize-ssh-alpine-3-8:
+  build-v1-22-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT_TAG: v1.22.0-envsubst-git-jq-kustomize-ssh-alpine-3.8
-      # VARIANT_TAG_WITH_REF: v1.22.0-envsubst-git-jq-kustomize-ssh-alpine-3.8-${GITHUB_REF}
-      VARIANT_BUILD_DIR: variants/v1.22.0-envsubst-git-jq-kustomize-ssh-alpine-3.8
+      VARIANT_TAG: v1.22.0-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
+      # VARIANT_TAG_WITH_REF: v1.22.0-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8-${GITHUB_REF}
+      VARIANT_BUILD_DIR: variants/v1.22.0-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -401,12 +401,12 @@ jobs:
       run: docker logout
       if: always()
 
-  build-v1-21-0-envsubst-git-jq-kustomize-ssh-alpine-3-8:
+  build-v1-21-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT_TAG: v1.21.0-envsubst-git-jq-kustomize-ssh-alpine-3.8
-      # VARIANT_TAG_WITH_REF: v1.21.0-envsubst-git-jq-kustomize-ssh-alpine-3.8-${GITHUB_REF}
-      VARIANT_BUILD_DIR: variants/v1.21.0-envsubst-git-jq-kustomize-ssh-alpine-3.8
+      VARIANT_TAG: v1.21.0-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
+      # VARIANT_TAG_WITH_REF: v1.21.0-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8-${GITHUB_REF}
+      VARIANT_BUILD_DIR: variants/v1.21.0-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -661,12 +661,12 @@ jobs:
       run: docker logout
       if: always()
 
-  build-v1-20-4-envsubst-git-jq-kustomize-ssh-alpine-3-8:
+  build-v1-20-4-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT_TAG: v1.20.4-envsubst-git-jq-kustomize-ssh-alpine-3.8
-      # VARIANT_TAG_WITH_REF: v1.20.4-envsubst-git-jq-kustomize-ssh-alpine-3.8-${GITHUB_REF}
-      VARIANT_BUILD_DIR: variants/v1.20.4-envsubst-git-jq-kustomize-ssh-alpine-3.8
+      VARIANT_TAG: v1.20.4-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
+      # VARIANT_TAG_WITH_REF: v1.20.4-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8-${GITHUB_REF}
+      VARIANT_BUILD_DIR: variants/v1.20.4-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -921,12 +921,12 @@ jobs:
       run: docker logout
       if: always()
 
-  build-v1-19-7-envsubst-git-jq-kustomize-ssh-alpine-3-8:
+  build-v1-19-7-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT_TAG: v1.19.7-envsubst-git-jq-kustomize-ssh-alpine-3.8
-      # VARIANT_TAG_WITH_REF: v1.19.7-envsubst-git-jq-kustomize-ssh-alpine-3.8-${GITHUB_REF}
-      VARIANT_BUILD_DIR: variants/v1.19.7-envsubst-git-jq-kustomize-ssh-alpine-3.8
+      VARIANT_TAG: v1.19.7-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
+      # VARIANT_TAG_WITH_REF: v1.19.7-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8-${GITHUB_REF}
+      VARIANT_BUILD_DIR: variants/v1.19.7-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -1181,12 +1181,12 @@ jobs:
       run: docker logout
       if: always()
 
-  build-v1-18-15-envsubst-git-jq-kustomize-ssh-alpine-3-8:
+  build-v1-18-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT_TAG: v1.18.15-envsubst-git-jq-kustomize-ssh-alpine-3.8
-      # VARIANT_TAG_WITH_REF: v1.18.15-envsubst-git-jq-kustomize-ssh-alpine-3.8-${GITHUB_REF}
-      VARIANT_BUILD_DIR: variants/v1.18.15-envsubst-git-jq-kustomize-ssh-alpine-3.8
+      VARIANT_TAG: v1.18.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
+      # VARIANT_TAG_WITH_REF: v1.18.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8-${GITHUB_REF}
+      VARIANT_BUILD_DIR: variants/v1.18.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -1441,12 +1441,12 @@ jobs:
       run: docker logout
       if: always()
 
-  build-v1-17-17-envsubst-git-jq-kustomize-ssh-alpine-3-8:
+  build-v1-17-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT_TAG: v1.17.17-envsubst-git-jq-kustomize-ssh-alpine-3.8
-      # VARIANT_TAG_WITH_REF: v1.17.17-envsubst-git-jq-kustomize-ssh-alpine-3.8-${GITHUB_REF}
-      VARIANT_BUILD_DIR: variants/v1.17.17-envsubst-git-jq-kustomize-ssh-alpine-3.8
+      VARIANT_TAG: v1.17.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
+      # VARIANT_TAG_WITH_REF: v1.17.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8-${GITHUB_REF}
+      VARIANT_BUILD_DIR: variants/v1.17.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -1701,12 +1701,12 @@ jobs:
       run: docker logout
       if: always()
 
-  build-v1-16-15-envsubst-git-jq-kustomize-ssh-alpine-3-8:
+  build-v1-16-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT_TAG: v1.16.15-envsubst-git-jq-kustomize-ssh-alpine-3.8
-      # VARIANT_TAG_WITH_REF: v1.16.15-envsubst-git-jq-kustomize-ssh-alpine-3.8-${GITHUB_REF}
-      VARIANT_BUILD_DIR: variants/v1.16.15-envsubst-git-jq-kustomize-ssh-alpine-3.8
+      VARIANT_TAG: v1.16.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
+      # VARIANT_TAG_WITH_REF: v1.16.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8-${GITHUB_REF}
+      VARIANT_BUILD_DIR: variants/v1.16.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -1961,12 +1961,12 @@ jobs:
       run: docker logout
       if: always()
 
-  build-v1-15-12-envsubst-git-jq-kustomize-ssh-alpine-3-8:
+  build-v1-15-12-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT_TAG: v1.15.12-envsubst-git-jq-kustomize-ssh-alpine-3.8
-      # VARIANT_TAG_WITH_REF: v1.15.12-envsubst-git-jq-kustomize-ssh-alpine-3.8-${GITHUB_REF}
-      VARIANT_BUILD_DIR: variants/v1.15.12-envsubst-git-jq-kustomize-ssh-alpine-3.8
+      VARIANT_TAG: v1.15.12-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
+      # VARIANT_TAG_WITH_REF: v1.15.12-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8-${GITHUB_REF}
+      VARIANT_BUILD_DIR: variants/v1.15.12-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -2221,12 +2221,12 @@ jobs:
       run: docker logout
       if: always()
 
-  build-v1-14-10-envsubst-git-jq-kustomize-ssh-alpine-3-8:
+  build-v1-14-10-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT_TAG: v1.14.10-envsubst-git-jq-kustomize-ssh-alpine-3.8
-      # VARIANT_TAG_WITH_REF: v1.14.10-envsubst-git-jq-kustomize-ssh-alpine-3.8-${GITHUB_REF}
-      VARIANT_BUILD_DIR: variants/v1.14.10-envsubst-git-jq-kustomize-ssh-alpine-3.8
+      VARIANT_TAG: v1.14.10-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
+      # VARIANT_TAG_WITH_REF: v1.14.10-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8-${GITHUB_REF}
+      VARIANT_BUILD_DIR: variants/v1.14.10-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -2353,7 +2353,7 @@ jobs:
 
   # For Generate-DockerImageVariants: For CalVer releases. Each push to 'release' branch is a time-based release.
   converge-master-and-release-branches:
-    needs: [build-v1-22-0-alpine-3-8, build-v1-22-0-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-21-0-alpine-3-8, build-v1-21-0-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-20-4-alpine-3-8, build-v1-20-4-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-19-7-alpine-3-8, build-v1-19-7-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-18-15-alpine-3-8, build-v1-18-15-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-ssh-alpine-3-8]
+    needs: [build-v1-22-0-alpine-3-8, build-v1-22-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-21-0-alpine-3-8, build-v1-21-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-20-4-alpine-3-8, build-v1-20-4-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-19-7-alpine-3-8, build-v1-19-7-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-18-15-alpine-3-8, build-v1-18-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8]
     if: github.ref == 'refs/heads/release'
     runs-on: ubuntu-latest
     steps:
@@ -2403,7 +2403,7 @@ jobs:
         run: echo ${{ steps.resolve-release-tag.outputs.TAG }}
 
   update-draft-release:
-    needs: [build-v1-22-0-alpine-3-8, build-v1-22-0-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-21-0-alpine-3-8, build-v1-21-0-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-20-4-alpine-3-8, build-v1-20-4-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-19-7-alpine-3-8, build-v1-19-7-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-18-15-alpine-3-8, build-v1-18-15-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-ssh-alpine-3-8, resolve-release-tag]
+    needs: [build-v1-22-0-alpine-3-8, build-v1-22-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-21-0-alpine-3-8, build-v1-21-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-20-4-alpine-3-8, build-v1-20-4-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-19-7-alpine-3-8, build-v1-19-7-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-18-15-alpine-3-8, build-v1-18-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, resolve-release-tag]
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
@@ -2423,7 +2423,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-draft-release:
-    needs: [build-v1-22-0-alpine-3-8, build-v1-22-0-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-21-0-alpine-3-8, build-v1-21-0-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-20-4-alpine-3-8, build-v1-20-4-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-19-7-alpine-3-8, build-v1-19-7-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-18-15-alpine-3-8, build-v1-18-15-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-ssh-alpine-3-8, converge-master-and-release-branches]
+    needs: [build-v1-22-0-alpine-3-8, build-v1-22-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-21-0-alpine-3-8, build-v1-21-0-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-20-4-alpine-3-8, build-v1-20-4-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-19-7-alpine-3-8, build-v1-19-7-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-18-15-alpine-3-8, build-v1-18-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-17-17-alpine-3-8, build-v1-17-17-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-16-15-alpine-3-8, build-v1-16-15-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-15-12-alpine-3-8, build-v1-15-12-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, build-v1-14-10-alpine-3-8, build-v1-14-10-envsubst-git-jq-kustomize-sops-ssh-alpine-3-8, converge-master-and-release-branches]
     # For Generate-DockerImageVariants: For CalVer releases. Each push to 'release' branch is a time-based release.
     # if: startsWith(github.ref, 'refs/tags/')
     if: github.ref == 'refs/heads/release'

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,30 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Generate-DockerImageVariants",
+            "type": "process",
+            "command": "pwsh",
+            "args": [
+                "-c",
+                "Generate-DockerImageVariants ."
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "Install DockerImageVariants module",
+            "type": "process",
+            "command": "pwsh",
+            "args": [
+                "-c",
+                "Install-Module -Name Generate-DockerImageVariants -Repository PSGallery -Scope CurrentUser -Force -Verbose"
+            ],
+            "group": "build"
+        }
+    ]
+}
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # docker-kubectl
 
 [![github-actions](https://github.com/theohbrothers/docker-kubectl/workflows/ci-master-pr/badge.svg)](https://github.com/theohbrothers/docker-kubectl/actions)
-[![github-tag](https://img.shields.io/github/tag/theohbrothers/docker-kubectl)](https://github.com/theohbrothers/docker-kubectl/releases/)
+[![github-release](https://img.shields.io/github/v/release/theohbrothers/docker-kubectl?style=flat-square)](https://github.com/theohbrothers/docker-kubectl/releases/)
 [![docker-image-size](https://img.shields.io/docker/image-size/theohbrothers/docker-kubectl/latest)](https://hub.docker.com/r/theohbrothers/docker-kubectl)
 
 Dockerized `kubectl` with useful tools.
@@ -11,21 +11,21 @@ Dockerized `kubectl` with useful tools.
 | Tag | Dockerfile Build Context |
 |:-------:|:---------:|
 | `:v1.22.0-alpine-3.8`, `:latest` | [View](variants/v1.22.0-alpine-3.8 ) |
-| `:v1.22.0-envsubst-git-jq-kustomize-ssh-alpine-3.8` | [View](variants/v1.22.0-envsubst-git-jq-kustomize-ssh-alpine-3.8 ) |
+| `:v1.22.0-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.22.0-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8 ) |
 | `:v1.21.0-alpine-3.8` | [View](variants/v1.21.0-alpine-3.8 ) |
-| `:v1.21.0-envsubst-git-jq-kustomize-ssh-alpine-3.8` | [View](variants/v1.21.0-envsubst-git-jq-kustomize-ssh-alpine-3.8 ) |
+| `:v1.21.0-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.21.0-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8 ) |
 | `:v1.20.4-alpine-3.8` | [View](variants/v1.20.4-alpine-3.8 ) |
-| `:v1.20.4-envsubst-git-jq-kustomize-ssh-alpine-3.8` | [View](variants/v1.20.4-envsubst-git-jq-kustomize-ssh-alpine-3.8 ) |
+| `:v1.20.4-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.20.4-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8 ) |
 | `:v1.19.7-alpine-3.8` | [View](variants/v1.19.7-alpine-3.8 ) |
-| `:v1.19.7-envsubst-git-jq-kustomize-ssh-alpine-3.8` | [View](variants/v1.19.7-envsubst-git-jq-kustomize-ssh-alpine-3.8 ) |
+| `:v1.19.7-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.19.7-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8 ) |
 | `:v1.18.15-alpine-3.8` | [View](variants/v1.18.15-alpine-3.8 ) |
-| `:v1.18.15-envsubst-git-jq-kustomize-ssh-alpine-3.8` | [View](variants/v1.18.15-envsubst-git-jq-kustomize-ssh-alpine-3.8 ) |
+| `:v1.18.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.18.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8 ) |
 | `:v1.17.17-alpine-3.8` | [View](variants/v1.17.17-alpine-3.8 ) |
-| `:v1.17.17-envsubst-git-jq-kustomize-ssh-alpine-3.8` | [View](variants/v1.17.17-envsubst-git-jq-kustomize-ssh-alpine-3.8 ) |
+| `:v1.17.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.17.17-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8 ) |
 | `:v1.16.15-alpine-3.8` | [View](variants/v1.16.15-alpine-3.8 ) |
-| `:v1.16.15-envsubst-git-jq-kustomize-ssh-alpine-3.8` | [View](variants/v1.16.15-envsubst-git-jq-kustomize-ssh-alpine-3.8 ) |
+| `:v1.16.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.16.15-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8 ) |
 | `:v1.15.12-alpine-3.8` | [View](variants/v1.15.12-alpine-3.8 ) |
-| `:v1.15.12-envsubst-git-jq-kustomize-ssh-alpine-3.8` | [View](variants/v1.15.12-envsubst-git-jq-kustomize-ssh-alpine-3.8 ) |
+| `:v1.15.12-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.15.12-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8 ) |
 | `:v1.14.10-alpine-3.8` | [View](variants/v1.14.10-alpine-3.8 ) |
-| `:v1.14.10-envsubst-git-jq-kustomize-ssh-alpine-3.8` | [View](variants/v1.14.10-envsubst-git-jq-kustomize-ssh-alpine-3.8 ) |
+| `:v1.14.10-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8` | [View](variants/v1.14.10-envsubst-git-jq-kustomize-sops-ssh-alpine-3.8 ) |
 
diff --git a/generate/definitions/FILES.ps1 b/generate/definitions/FILES.ps1
@@ -6,6 +6,3 @@ $FILES = @(
     # '.gitlab-ci.yml'
     'README.md'
 )
-
-# Send definitions down the pipeline
-$FILES
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
@@ -18,7 +18,7 @@ $local:VARIANTS_MATRIX = @(
             distro_version = '3.8'
             subvariants = @(
                 @{ components = @(); tag_as_latest = if ($v -eq ($local:VARIANTS_PACKAGE_VERSIONS | ? { $_ -match '^v\d+\.\d+\.\d+$' } | Select-Object -First 1 )) { $true } else { $false } }
-                @{ components = @( 'envsubst', 'git', 'jq', 'kustomize', 'ssh' ) }
+                @{ components = @( 'envsubst', 'git', 'jq', 'kustomize', 'sops', 'ssh' ) }
             )
         }
     }
@@ -57,8 +57,8 @@ $VARIANTS_SHARED = @{
         templates = @{
             'Dockerfile' = @{
                 common = $true
-                includeHeader = $true
-                includeFooter = $true
+                includeHeader = $false
+                includeFooter = $false
                 passes = @(
                     @{
                         variables = @{}
@@ -68,6 +68,3 @@ $VARIANTS_SHARED = @{
         }
     }
 }
-
-# Send definitions down the pipeline
-$VARIANTS
diff --git a/generate/templates/.github/release-drafter.yml.ps1 b/generate/templates/.github/release-drafter.yml.ps1
@@ -1,6 +1,7 @@
 @'
-name-template: 'v$RESOLVED_VERSION  🌈'
-tag-template: 'v$RESOLVED_VERSION'
+# For Generate-DockerImageVariants: For CalVer releases. Each push to 'release' branch is a time-based release.
+name-template: '$RESOLVED_VERSION  🌈'
+tag-template: '$RESOLVED_VERSION'
 categories:
   - title: '🚀 Features'
     labels:

diff --git a/generate/templates/Dockerfile.footer.ps1 b/generate/templates/Dockerfile.footer.ps1
diff --git a/generate/templates/Dockerfile.header.ps1 b/generate/templates/Dockerfile.header.ps1