Merge pull request #111 from theohbrothers/enhancement/add-docker-to-…

…versions.json Enhancement: Add `docker` to `versions.json`
theohbrothers · Oct 21, 2023 · 4dbd98c · 4dbd98c
2 parents cf5cb18 + bfe9749
commit 4dbd98c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
@@ -80,5 +80,8 @@ $VARIANTS_SHARED = @{
     }
 }
 
+# Global versions
+$global:VERSIONS = $local:VERSIONS
+
 # Global cache for remote file content
 $global:CACHE = @{}
diff --git a/generate/definitions/versions.json b/generate/definitions/versions.json
@@ -18,6 +18,13 @@
     "versionsChangeScope": "minor",
     "versionsNewScript": "Invoke-WebRequest https://api.github.com/repos/coder/code-server/git/refs/tags | ConvertFrom-Json | % { $_.ref -replace 'refs/tags/v', ''} | ? { $_ -match '^\\d+\\.\\d+\\.\\d+$' } | Sort-Object { [version]$_ } -Descending | ? { [version]$_ -ge [version]'4.6' }"
   },
+  "docker": {
+    "versions": [
+      "20.10.23"
+    ],
+    "versionsChangeScope": "minor",
+    "versionsNewScript": "Invoke-WebRequest https://api.github.com/repos/moby/moby/git/refs/tags | ConvertFrom-Json | % { $_.ref -replace 'refs/tags/v', '' } | ? { $_ -match '^\\d+\\.\\d+\\.\\d+$' } | Sort-Object { [version]$_ } -Descending | ? { $v = [version]$_; $v.Major -eq '20' -and $v.Minor -eq '10' }"
+  },
   "go": {
     "versions": [
       "1.20.10"

diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
@@ -291,7 +291,7 @@ RUN code-server --install-extension redhat.vscode-yaml@1.9.1
 "@
 foreach ($c in $VARIANT['_metadata']['components']) {
     if ($c -eq 'docker' -or $c -eq 'docker-rootless') {
-        $DOCKER_VERSION = '20.10.23'
+        $DOCKER_VERSION = $global:VERSIONS.docker.versions[0]
 @"
 # Install docker
 # See: https://github.com/moby/moby/blob/v20.10.22/project/PACKAGERS.md