Refactor: Bump variants to alpine 3.19

theohbrothers · Jan 2, 2025 · 208ec9e · 208ec9e
1 parent 8530ccc
commit 208ec9e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
@@ -1,18 +1,18 @@
-$local:VERSIONS = @( Get-Content $PSScriptRoot/versions.json -Encoding utf8 -raw | ConvertFrom-Json )
-$local:PACKAGE = 'isync'
+# $local:VERSIONS = @( Get-Content $PSScriptRoot/versions.json -Encoding utf8 -raw | ConvertFrom-Json )
 
 # Docker image variants' definitions
 $local:VARIANTS_MATRIX = @(
-    foreach ($v in $local:VERSIONS.isync.versions) {
-        @{
-            package_version = $v
-            subvariants = @(
-                @{ components = @() }
-                @{ components = @('pingme') }
-                @{ components = @('restic') }
-                @{ components = @('restic', 'pingme') }
-            )
-        }
+    @{
+        package = 'isync'
+        package_version = '1.4.4'
+        distro = 'alpine'
+        distro_version = '3.19'
+        subvariants = @(
+            @{ components = @() }
+            @{ components = @('pingme') }
+            @{ components = @('restic') }
+            @{ components = @('restic', 'pingme') }
+        )
     }
 )
 
@@ -22,7 +22,10 @@ $VARIANTS = @(
             @{
                 # Metadata object
                 _metadata = @{
+                    package = $variant['package']
                     package_version = $variant['package_version']
+                    distro = $variant['distro']
+                    distro_version = $variant['distro_version']
                     platforms = & {
                         if ( $subVariant['components'] -contains 'pingme') {
                             'linux/386,linux/amd64,linux/arm/v7,linux/arm64'

diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
@@ -1,6 +1,6 @@
 @"
 # syntax=docker/dockerfile:1
-FROM alpine:3.17
+FROM $( $VARIANT['_metadata']['distro'] ):$( $VARIANT['_metadata']['distro_version'] )
 ARG TARGETPLATFORM
 ARG TARGETOS
 ARG TARGETARCH
@@ -22,7 +22,7 @@ RUN set -eu; \
 # Install isync
 RUN apk add --no-cache ca-certificates
 RUN set -eux; \
-    apk add --no-cache isync~$( $VARIANT['_metadata']['package_version'] ); \
+    apk add --no-cache $( $VARIANT['_metadata']['package'] )~$( $VARIANT['_metadata']['package_version'] ); \
     # For mbsync-get-cert to get a self-signed certificate
     apk add --no-cache openssl; \
     mbsync --version

diff --git a/variants/1.4.4-pingme/Dockerfile b/variants/1.4.4-pingme/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM alpine:3.17
+FROM alpine:3.19
 ARG TARGETPLATFORM
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/variants/1.4.4-restic-pingme/Dockerfile b/variants/1.4.4-restic-pingme/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM alpine:3.17
+FROM alpine:3.19
 ARG TARGETPLATFORM
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/variants/1.4.4-restic/Dockerfile b/variants/1.4.4-restic/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM alpine:3.17
+FROM alpine:3.19
 ARG TARGETPLATFORM
 ARG TARGETOS
 ARG TARGETARCH

diff --git a/variants/1.4.4/Dockerfile b/variants/1.4.4/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM alpine:3.17
+FROM alpine:3.19
 ARG TARGETPLATFORM
 ARG TARGETOS
 ARG TARGETARCH