From 8329aaffc6b01b68491919cf1e5064e89fc91a41 Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Sun, 30 May 2021 13:28:06 +0200
Subject: [PATCH] fix devcontainer build process

---
 .devcontainer.json                            | 2 +-
 containers/dev/devcontainer/BASE              | 1 +
 containers/dev/devcontainer/Dockerfile        | 4 ++--
 containers/dev/devcontainer/VERSION           | 1 +
 containers/dev/devcontainer/latest-base.sh    | 3 +++
 containers/dev/devcontainer/latest-version.sh | 3 +++
 6 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 containers/dev/devcontainer/BASE
 create mode 100644 containers/dev/devcontainer/VERSION
 create mode 100644 containers/dev/devcontainer/latest-base.sh
 create mode 100644 containers/dev/devcontainer/latest-version.sh

diff --git a/.devcontainer.json b/.devcontainer.json
index b803ceb0d76..606150d34cd 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -6,7 +6,7 @@
         "context": "..",
         "dockerfile": "containers/dev/devcontainer/Dockerfile",
         "args": {
-            "VARIANT": "1.16",
+            "VERSION": "1.16",
         }
     },
 
diff --git a/containers/dev/devcontainer/BASE b/containers/dev/devcontainer/BASE
new file mode 100644
index 00000000000..e71519696fb
--- /dev/null
+++ b/containers/dev/devcontainer/BASE
@@ -0,0 +1 @@
+1.16
diff --git a/containers/dev/devcontainer/Dockerfile b/containers/dev/devcontainer/Dockerfile
index d7db0d3f1dc..4d604cc2f93 100644
--- a/containers/dev/devcontainer/Dockerfile
+++ b/containers/dev/devcontainer/Dockerfile
@@ -1,5 +1,5 @@
-ARG VARIANT="1.16"
-FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}
+ARG VERSION="1.16"
+FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VERSION}
 
 ARG HELM_VERSION="3.5.4"
 ARG CT_VERSION=3.3.1
diff --git a/containers/dev/devcontainer/VERSION b/containers/dev/devcontainer/VERSION
new file mode 100644
index 00000000000..e71519696fb
--- /dev/null
+++ b/containers/dev/devcontainer/VERSION
@@ -0,0 +1 @@
+1.16
diff --git a/containers/dev/devcontainer/latest-base.sh b/containers/dev/devcontainer/latest-base.sh
new file mode 100644
index 00000000000..09504ec9604
--- /dev/null
+++ b/containers/dev/devcontainer/latest-base.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+printf "%s" "1.16"
diff --git a/containers/dev/devcontainer/latest-version.sh b/containers/dev/devcontainer/latest-version.sh
new file mode 100644
index 00000000000..09504ec9604
--- /dev/null
+++ b/containers/dev/devcontainer/latest-version.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+printf "%s" "1.16"