Update .NET 9.0 rc1, remove alpine3.19 (#15)

* Remove alpine3.19 (6.0-alpine3.19, 8.0-alpine3.19) * Switch to .NET 9.0 RC * Add azurelinux3.0: 8.0-azurelinux3.0 and 9.0-azurelinux3.0 * Add azurelinux3.0: 8.0-azurelinux3.0 and 9.0-azurelinux3.0 * Drop azurelinux3.0, as not package installation yet
NetLah · Oct 14, 2024 · eab4c2d · eab4c2d
1 parent 5a8ffb7
commit eab4c2d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 25 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -11,13 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         image: [
-            # { ver: "6.0", arch: alpine3.17, matching: "6.0" },
-            {
-              ver: "6.0",
-              arch: alpine3.19,
-              matching: "6.0",
-              tags: "6.0-alpine3.19",
-            },
             {
               ver: "6.0",
               arch: alpine3.20,
@@ -38,12 +31,6 @@ jobs:
             },
             { ver: "6.0", arch: focal, matching: "6.0", tags: "6.0-focal" },
             { ver: "6.0", arch: jammy, matching: "6.0", tags: "6.0-jammy" },
-            {
-              ver: "8.0",
-              arch: alpine3.19,
-              matching: "8.0",
-              tags: "8.0-alpine3.19",
-            },
             {
               ver: "8.0",
               arch: alpine3.20,
@@ -58,25 +45,50 @@ jobs:
             },
             { ver: "8.0", arch: jammy, matching: "8.0", tags: "8.0-jammy" },
             { ver: "8.0", arch: noble, matching: "8.0", tags: "8.0-noble" },
+            # {
+            #   ver: "8.0",
+            #   arch: azurelinux3.0,
+            #   matching: "8.0",
+            #   tags: "8.0-azurelinux3.0",
+            # },
             # { ver: 8.0-preview, arch: jammy-chiseled, matching: "8.0.0-preview" },
             {
-              ver: 9.0-preview,
+              ver: "9.0",
               arch: alpine3.20,
-              matching: "9.0.0-preview",
-              tags: "9.0-alpine,9.0-preview-alpine,9.0-preview,9.0-alpine3.20,9.0",
+              matching: "9.0",
+              tags: "9.0-alpine,9.0-alpine3.20,9.0",
             },
             {
-              ver: 9.0-preview,
+              ver: "9.0",
               arch: bookworm-slim,
-              matching: "9.0.0-preview",
-              tags: "9.0-preview-bookworm-slim,9.0-bookworm-slim",
-            },
-            {
-              ver: 9.0-preview,
-              arch: noble,
-              matching: "9.0.0-preview",
-              tags: "9.0-preview-noble,9.0-noble",
+              matching: "9.0",
+              tags: "9.0-bookworm-slim",
             },
+            { ver: "9.0", arch: noble, matching: "9.0", tags: "9.0-noble" },
+            # {
+            #   ver: "9.0",
+            #   arch: azurelinux3.0,
+            #   matching: "9.0",
+            #   tags: "9.0-azurelinux3.0",
+            # },
+            # {
+            #   ver: 10.0-preview,
+            #   arch: alpine3.20,
+            #   matching: "10.0.0-preview",
+            #   tags: "10.0-alpine,10.0-preview-alpine,10.0-preview,10.0-alpine3.20,10.0",
+            # },
+            # {
+            #   ver: 10.0-preview,
+            #   arch: bookworm-slim,
+            #   matching: "10.0.0-preview",
+            #   tags: "10.0-preview-bookworm-slim,10.0-bookworm-slim",
+            # },
+            # {
+            #   ver: 10.0-preview,
+            #   arch: noble,
+            #   matching: "10.0.0-preview",
+            #   tags: "10.0-preview-noble,10.0-noble",
+            # },
           ]
     name: ${{ matrix.image.ver }}-${{ matrix.image.arch }}
     runs-on: ubuntu-latest

diff --git a/docker-build.ps1 b/docker-build.ps1
@@ -32,6 +32,7 @@ $mappingVersionArch = @{
     '^8\.0(\.\d+)?-jammy-chiseled$'              = '8.0-jammy-chiseled', 'jammy-chiseled'
     '^8\.0(\.\d+)?-noble$'                       = '8.0-noble', '8.0', 'noble'
     '^8\.0(\.\d+)?-noble-chiseled$'              = '8.0-noble-chiseled', 'noble-chiseled'
+    '^8\.0(\.\d+)?-azurelinux3.0$'               = '8.0-azurelinux3.0', '8.0', 'azurelinux3.0'
 
     '^9\.0(\.\d+)?-preview[^-]*-alpine(.*)$'     = '9.0-preview-alpine', '9.0-alpine', '9.0'
     '^9\.0(\.\d+)?-preview[^-]*-bookworm-slim$'  = '9.0-preview-bookworm-slim', '9.0-preview', '9.0', 'preview-bookworm-slim', 'bookworm-slim'
@@ -47,6 +48,7 @@ $mappingVersionArch = @{
     '^9\.0(\.\d+)?-bookworm-slim$'               = '9.0-bookworm-slim', '9.0', 'bookworm-slim'
     '^9\.0(\.\d+)?-noble$'                       = '9.0-noble', '9.0', 'noble'
     '^9\.0(\.\d+)?-noble-chiseled$'              = '9.0-noble-chiseled', 'noble-chiseled'
+    '^9\.0(\.\d+)?-azurelinux3.0$'               = '9.0-azurelinux3.0', '9.0', 'noble'
 }