From d674fe9042cd9bd3df50a5b3396f25355e1ae7d7 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Sun, 24 Mar 2024 16:07:15 -0700 Subject: [PATCH] Fix latest label logic --- .gitignore | 2 + CreateMatrix/ProductInfo.cs | 33 ++--- CreateMatrix/ReleasesJsonSchema.cs | 3 +- Docker/DWSpectrum-LSIO.Dockerfile | 6 +- Docker/DWSpectrum.Dockerfile | 6 +- Docker/NxMeta-LSIO.Dockerfile | 6 +- Docker/NxMeta.Dockerfile | 6 +- Docker/NxWitness-LSIO.Dockerfile | 6 +- Docker/NxWitness.Dockerfile | 6 +- Make/Matrix.json | 192 ++++++++++++++++++++++++++--- Make/Version.json | 27 +++- Make/dwspectrum.docker | 6 +- Make/nxmeta.docker | 6 +- Make/nxwitness.docker | 6 +- 14 files changed, 248 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 7a4e0e0..5bda12d 100644 --- a/.gitignore +++ b/.gitignore @@ -512,3 +512,5 @@ fabric.properties .idea *.DotSettings + +.mono diff --git a/CreateMatrix/ProductInfo.cs b/CreateMatrix/ProductInfo.cs index dffa5fc..88bc2e3 100644 --- a/CreateMatrix/ProductInfo.cs +++ b/CreateMatrix/ProductInfo.cs @@ -142,14 +142,28 @@ private void AddLabel(VersionInfo versionInfo, VersionInfo.LabelType label) if (versionInfo.CompareTo(existingVersion) <= 0) return; - Log.Logger.Information("{Product}: Replacing {Label} from {ExistingVersion} to {NewVersion}", Product, label, existingVersion.Version, versionInfo.Version); + Log.Logger.Warning("{Product}: Replacing {Label} from {ExistingVersion} to {NewVersion}", Product, label, existingVersion.Version, versionInfo.Version); - // Remove from other version + // Remove from other version and add to this version existingVersion.Labels.Remove(label); - // Add to this version versionInfo.Labels.Add(label); } + private VersionInfo? FindMissingLabel(VersionInfo.LabelType targetLabel, List sourceLabels) + { + foreach (var label in sourceLabels) + { + // Find last matching item, must be sorted + var version = Versions.FindLast(item => item.Labels.Contains(label)); + if (version != default(VersionInfo)) + { + Log.Logger.Warning("{Product}: Using {SourceLabel} for {TargetLabel}", Product, label, targetLabel); + return version; + } + } + return default; + } + private void VerifyLabels() { // Sort by version number @@ -158,25 +172,16 @@ private void VerifyLabels() // If no Latest label is set, use Stable or RC or Beta as Latest if (!Versions.Any(item => item.Labels.Contains(VersionInfo.LabelType.Latest))) { - // Find Stable or RC or Beta to use as Latest - // Versions are ordered so highest version will be used - var latest = Versions.FindLast(item => item.Labels.Contains(VersionInfo.LabelType.Stable)); - latest ??= Versions.FindLast(item => item.Labels.Contains(VersionInfo.LabelType.RC)); - latest ??= Versions.FindLast(item => item.Labels.Contains(VersionInfo.LabelType.Beta)); + var latest = FindMissingLabel(VersionInfo.LabelType.Latest, [VersionInfo.LabelType.Stable, VersionInfo.LabelType.RC, VersionInfo.LabelType.Beta]); Debug.Assert(latest != default(VersionInfo)); - - // Add latest latest.Labels.Add(VersionInfo.LabelType.Latest); } // If no Stable label is set, use Latest as stable if (!Versions.Any(item => item.Labels.Contains(VersionInfo.LabelType.Stable))) { - // Find latest - var stable = Versions.Find(item => item.Labels.Contains(VersionInfo.LabelType.Latest)); + var stable = FindMissingLabel(VersionInfo.LabelType.Stable, [VersionInfo.LabelType.Latest]); Debug.Assert(stable != default(VersionInfo)); - - // Add the stable label stable.Labels.Add(VersionInfo.LabelType.Stable); } diff --git a/CreateMatrix/ReleasesJsonSchema.cs b/CreateMatrix/ReleasesJsonSchema.cs index 6ac559e..8908030 100644 --- a/CreateMatrix/ReleasesJsonSchema.cs +++ b/CreateMatrix/ReleasesJsonSchema.cs @@ -39,7 +39,8 @@ internal VersionInfo.LabelType GetLabel() // Determine the equivalent label return PublicationType switch { - "release" => IsPublished() ? VersionInfo.LabelType.Stable : VersionInfo.LabelType.None, + // Use Stable or Latest based on if published or not + "release" => IsPublished() ? VersionInfo.LabelType.Stable : VersionInfo.LabelType.Latest, "rc" => VersionInfo.LabelType.RC, "beta" => VersionInfo.LabelType.Beta, _ => throw new InvalidEnumArgumentException($"Unknown PublicationType: {PublicationType}") diff --git a/Docker/DWSpectrum-LSIO.Dockerfile b/Docker/DWSpectrum-LSIO.Dockerfile index f395f30..37653f2 100644 --- a/Docker/DWSpectrum-LSIO.Dockerfile +++ b/Docker/DWSpectrum-LSIO.Dockerfile @@ -10,9 +10,9 @@ ARG LABEL_DESCRIPTION="DW Spectrum IPVMS Docker based on LinuxServer" # Download URL and version # Current values are defined by the build pipeline -ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_x64.zip" -ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_arm64.zip" -ARG DOWNLOAD_VERSION="5.1.2.37996" +ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_x64.zip" +ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_arm64.zip" +ARG DOWNLOAD_VERSION="5.1.3.38363" # NxWitness (networkoptix) or DWSpectrum (digitalwatchdog) or NxMeta (networkoptix-metavms) ARG RUNTIME_NAME="digitalwatchdog" diff --git a/Docker/DWSpectrum.Dockerfile b/Docker/DWSpectrum.Dockerfile index fe0a1bf..18b10c5 100644 --- a/Docker/DWSpectrum.Dockerfile +++ b/Docker/DWSpectrum.Dockerfile @@ -10,9 +10,9 @@ ARG LABEL_DESCRIPTION="DW Spectrum IPVMS Docker" # Download URL and version # Current values are defined by the build pipeline -ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_x64.zip" -ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_arm64.zip" -ARG DOWNLOAD_VERSION="5.1.2.37996" +ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_x64.zip" +ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_arm64.zip" +ARG DOWNLOAD_VERSION="5.1.3.38363" # NxWitness (networkoptix) or DWSpectrum (digitalwatchdog) or NxMeta (networkoptix-metavms) ARG RUNTIME_NAME="digitalwatchdog" diff --git a/Docker/NxMeta-LSIO.Dockerfile b/Docker/NxMeta-LSIO.Dockerfile index dbe6af1..70dda07 100644 --- a/Docker/NxMeta-LSIO.Dockerfile +++ b/Docker/NxMeta-LSIO.Dockerfile @@ -10,9 +10,9 @@ ARG LABEL_DESCRIPTION="Nx Meta VMS Docker based on LinuxServer" # Download URL and version # Current values are defined by the build pipeline -ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_x64.zip" -ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_arm64.zip" -ARG DOWNLOAD_VERSION="5.1.2.37996" +ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_x64.zip" +ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_arm64.zip" +ARG DOWNLOAD_VERSION="5.1.3.38363" # NxWitness (networkoptix) or DWSpectrum (digitalwatchdog) or NxMeta (networkoptix-metavms) ARG RUNTIME_NAME="networkoptix-metavms" diff --git a/Docker/NxMeta.Dockerfile b/Docker/NxMeta.Dockerfile index 403f73d..7113e43 100644 --- a/Docker/NxMeta.Dockerfile +++ b/Docker/NxMeta.Dockerfile @@ -10,9 +10,9 @@ ARG LABEL_DESCRIPTION="Nx Meta VMS Docker" # Download URL and version # Current values are defined by the build pipeline -ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_x64.zip" -ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_arm64.zip" -ARG DOWNLOAD_VERSION="5.1.2.37996" +ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_x64.zip" +ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_arm64.zip" +ARG DOWNLOAD_VERSION="5.1.3.38363" # NxWitness (networkoptix) or DWSpectrum (digitalwatchdog) or NxMeta (networkoptix-metavms) ARG RUNTIME_NAME="networkoptix-metavms" diff --git a/Docker/NxWitness-LSIO.Dockerfile b/Docker/NxWitness-LSIO.Dockerfile index 176297b..a67127e 100644 --- a/Docker/NxWitness-LSIO.Dockerfile +++ b/Docker/NxWitness-LSIO.Dockerfile @@ -10,9 +10,9 @@ ARG LABEL_DESCRIPTION="Nx Witness VMS Docker based on LinuxServer" # Download URL and version # Current values are defined by the build pipeline -ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_x64.zip" -ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_arm64.zip" -ARG DOWNLOAD_VERSION="5.1.2.37996" +ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_x64.zip" +ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_arm64.zip" +ARG DOWNLOAD_VERSION="5.1.3.38363" # NxWitness (networkoptix) or DWSpectrum (digitalwatchdog) or NxMeta (networkoptix-metavms) ARG RUNTIME_NAME="networkoptix" diff --git a/Docker/NxWitness.Dockerfile b/Docker/NxWitness.Dockerfile index 35d54a4..8fdc205 100644 --- a/Docker/NxWitness.Dockerfile +++ b/Docker/NxWitness.Dockerfile @@ -10,9 +10,9 @@ ARG LABEL_DESCRIPTION="Nx Witness VMS Docker" # Download URL and version # Current values are defined by the build pipeline -ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_x64.zip" -ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_arm64.zip" -ARG DOWNLOAD_VERSION="5.1.2.37996" +ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_x64.zip" +ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_arm64.zip" +ARG DOWNLOAD_VERSION="5.1.3.38363" # NxWitness (networkoptix) or DWSpectrum (digitalwatchdog) or NxMeta (networkoptix-metavms) ARG RUNTIME_NAME="networkoptix" diff --git a/Make/Matrix.json b/Make/Matrix.json index 1117913..6aaaeae 100644 --- a/Make/Matrix.json +++ b/Make/Matrix.json @@ -8,7 +8,6 @@ "CacheScope": "default", "Tags": [ "docker.io/ptr727/nxmeta:5.1.2.37996", - "docker.io/ptr727/nxmeta:latest", "docker.io/ptr727/nxmeta:stable" ], "Args": [ @@ -17,6 +16,20 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "NxMeta", + "Branch": "main", + "CacheScope": "default", + "Tags": [ + "docker.io/ptr727/nxmeta:5.1.3.38363", + "docker.io/ptr727/nxmeta:latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "NxMeta", "Branch": "main", @@ -37,7 +50,6 @@ "CacheScope": "lsio", "Tags": [ "docker.io/ptr727/nxmeta-lsio:5.1.2.37996", - "docker.io/ptr727/nxmeta-lsio:latest", "docker.io/ptr727/nxmeta-lsio:stable" ], "Args": [ @@ -46,6 +58,20 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "NxMeta-LSIO", + "Branch": "main", + "CacheScope": "lsio", + "Tags": [ + "docker.io/ptr727/nxmeta-lsio:5.1.3.38363", + "docker.io/ptr727/nxmeta-lsio:latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "NxMeta-LSIO", "Branch": "main", @@ -66,7 +92,6 @@ "CacheScope": "default", "Tags": [ "docker.io/ptr727/nxwitness:5.1.2.37996", - "docker.io/ptr727/nxwitness:latest", "docker.io/ptr727/nxwitness:stable" ], "Args": [ @@ -75,13 +100,26 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "NxWitness", + "Branch": "main", + "CacheScope": "default", + "Tags": [ + "docker.io/ptr727/nxwitness:5.1.3.38363", + "docker.io/ptr727/nxwitness:latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "NxWitness-LSIO", "Branch": "main", "CacheScope": "lsio", "Tags": [ "docker.io/ptr727/nxwitness-lsio:5.1.2.37996", - "docker.io/ptr727/nxwitness-lsio:latest", "docker.io/ptr727/nxwitness-lsio:stable" ], "Args": [ @@ -90,13 +128,26 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "NxWitness-LSIO", + "Branch": "main", + "CacheScope": "lsio", + "Tags": [ + "docker.io/ptr727/nxwitness-lsio:5.1.3.38363", + "docker.io/ptr727/nxwitness-lsio:latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "DWSpectrum", "Branch": "main", "CacheScope": "default", "Tags": [ "docker.io/ptr727/dwspectrum:5.1.2.37996", - "docker.io/ptr727/dwspectrum:latest", "docker.io/ptr727/dwspectrum:stable" ], "Args": [ @@ -105,13 +156,26 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "DWSpectrum", + "Branch": "main", + "CacheScope": "default", + "Tags": [ + "docker.io/ptr727/dwspectrum:5.1.3.38363", + "docker.io/ptr727/dwspectrum:latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "DWSpectrum-LSIO", "Branch": "main", "CacheScope": "lsio", "Tags": [ "docker.io/ptr727/dwspectrum-lsio:5.1.2.37996", - "docker.io/ptr727/dwspectrum-lsio:latest", "docker.io/ptr727/dwspectrum-lsio:stable" ], "Args": [ @@ -120,14 +184,26 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "DWSpectrum-LSIO", + "Branch": "main", + "CacheScope": "lsio", + "Tags": [ + "docker.io/ptr727/dwspectrum-lsio:5.1.3.38363", + "docker.io/ptr727/dwspectrum-lsio:latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "NxMeta", "Branch": "develop", "CacheScope": "default", "Tags": [ - "docker.io/ptr727/nxmeta:develop", "docker.io/ptr727/nxmeta:develop-5.1.2.37996", - "docker.io/ptr727/nxmeta:develop-latest", "docker.io/ptr727/nxmeta:develop-stable" ], "Args": [ @@ -136,6 +212,21 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "NxMeta", + "Branch": "develop", + "CacheScope": "default", + "Tags": [ + "docker.io/ptr727/nxmeta:develop", + "docker.io/ptr727/nxmeta:develop-5.1.3.38363", + "docker.io/ptr727/nxmeta:develop-latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "NxMeta", "Branch": "develop", @@ -155,9 +246,7 @@ "Branch": "develop", "CacheScope": "lsio", "Tags": [ - "docker.io/ptr727/nxmeta-lsio:develop", "docker.io/ptr727/nxmeta-lsio:develop-5.1.2.37996", - "docker.io/ptr727/nxmeta-lsio:develop-latest", "docker.io/ptr727/nxmeta-lsio:develop-stable" ], "Args": [ @@ -166,6 +255,21 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "NxMeta-LSIO", + "Branch": "develop", + "CacheScope": "lsio", + "Tags": [ + "docker.io/ptr727/nxmeta-lsio:develop", + "docker.io/ptr727/nxmeta-lsio:develop-5.1.3.38363", + "docker.io/ptr727/nxmeta-lsio:develop-latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "NxMeta-LSIO", "Branch": "develop", @@ -185,9 +289,7 @@ "Branch": "develop", "CacheScope": "default", "Tags": [ - "docker.io/ptr727/nxwitness:develop", "docker.io/ptr727/nxwitness:develop-5.1.2.37996", - "docker.io/ptr727/nxwitness:develop-latest", "docker.io/ptr727/nxwitness:develop-stable" ], "Args": [ @@ -196,14 +298,27 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "NxWitness", + "Branch": "develop", + "CacheScope": "default", + "Tags": [ + "docker.io/ptr727/nxwitness:develop", + "docker.io/ptr727/nxwitness:develop-5.1.3.38363", + "docker.io/ptr727/nxwitness:develop-latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "NxWitness-LSIO", "Branch": "develop", "CacheScope": "lsio", "Tags": [ - "docker.io/ptr727/nxwitness-lsio:develop", "docker.io/ptr727/nxwitness-lsio:develop-5.1.2.37996", - "docker.io/ptr727/nxwitness-lsio:develop-latest", "docker.io/ptr727/nxwitness-lsio:develop-stable" ], "Args": [ @@ -212,14 +327,27 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "NxWitness-LSIO", + "Branch": "develop", + "CacheScope": "lsio", + "Tags": [ + "docker.io/ptr727/nxwitness-lsio:develop", + "docker.io/ptr727/nxwitness-lsio:develop-5.1.3.38363", + "docker.io/ptr727/nxwitness-lsio:develop-latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "DWSpectrum", "Branch": "develop", "CacheScope": "default", "Tags": [ - "docker.io/ptr727/dwspectrum:develop", "docker.io/ptr727/dwspectrum:develop-5.1.2.37996", - "docker.io/ptr727/dwspectrum:develop-latest", "docker.io/ptr727/dwspectrum:develop-stable" ], "Args": [ @@ -228,14 +356,27 @@ "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_x64.zip" ] }, + { + "Name": "DWSpectrum", + "Branch": "develop", + "CacheScope": "default", + "Tags": [ + "docker.io/ptr727/dwspectrum:develop", + "docker.io/ptr727/dwspectrum:develop-5.1.3.38363", + "docker.io/ptr727/dwspectrum:develop-latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_x64.zip" + ] + }, { "Name": "DWSpectrum-LSIO", "Branch": "develop", "CacheScope": "lsio", "Tags": [ - "docker.io/ptr727/dwspectrum-lsio:develop", "docker.io/ptr727/dwspectrum-lsio:develop-5.1.2.37996", - "docker.io/ptr727/dwspectrum-lsio:develop-latest", "docker.io/ptr727/dwspectrum-lsio:develop-stable" ], "Args": [ @@ -243,6 +384,21 @@ "DOWNLOAD_VERSION=5.1.2.37996", "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_x64.zip" ] + }, + { + "Name": "DWSpectrum-LSIO", + "Branch": "develop", + "CacheScope": "lsio", + "Tags": [ + "docker.io/ptr727/dwspectrum-lsio:develop", + "docker.io/ptr727/dwspectrum-lsio:develop-5.1.3.38363", + "docker.io/ptr727/dwspectrum-lsio:develop-latest" + ], + "Args": [ + "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_arm64.zip", + "DOWNLOAD_VERSION=5.1.3.38363", + "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_x64.zip" + ] } ] } \ No newline at end of file diff --git a/Make/Version.json b/Make/Version.json index fc62515..76cc7ca 100644 --- a/Make/Version.json +++ b/Make/Version.json @@ -10,7 +10,14 @@ "UriX64": "https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_x64.zip", "UriArm64": "https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_arm64.zip", "Labels": [ - "Stable", + "Stable" + ] + }, + { + "Version": "5.1.3.38363", + "UriX64": "https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_x64.zip", + "UriArm64": "https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_arm64.zip", + "Labels": [ "Latest" ] }, @@ -32,7 +39,14 @@ "UriX64": "https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_x64.zip", "UriArm64": "https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_arm64.zip", "Labels": [ - "Stable", + "Stable" + ] + }, + { + "Version": "5.1.3.38363", + "UriX64": "https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_x64.zip", + "UriArm64": "https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_arm64.zip", + "Labels": [ "Latest" ] } @@ -46,7 +60,14 @@ "UriX64": "https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_x64.zip", "UriArm64": "https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_arm64.zip", "Labels": [ - "Stable", + "Stable" + ] + }, + { + "Version": "5.1.3.38363", + "UriX64": "https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_x64.zip", + "UriArm64": "https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_arm64.zip", + "Labels": [ "Latest" ] } diff --git a/Make/dwspectrum.docker b/Make/dwspectrum.docker index f09d27c..2a781b5 100644 --- a/Make/dwspectrum.docker +++ b/Make/dwspectrum.docker @@ -1,8 +1,8 @@ # Download URL and version # Current values are defined by the build pipeline -ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_x64.zip" -ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/37996/dwspectrum-server_update-5.1.2.37996-linux_arm64.zip" -ARG DOWNLOAD_VERSION="5.1.2.37996" +ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_x64.zip" +ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/38363/dwspectrum-server_update-5.1.3.38363-linux_arm64.zip" +ARG DOWNLOAD_VERSION="5.1.3.38363" # NxWitness (networkoptix) or DWSpectrum (digitalwatchdog) or NxMeta (networkoptix-metavms) ARG RUNTIME_NAME="digitalwatchdog" diff --git a/Make/nxmeta.docker b/Make/nxmeta.docker index 1941207..72d5e36 100644 --- a/Make/nxmeta.docker +++ b/Make/nxmeta.docker @@ -1,8 +1,8 @@ # Download URL and version # Current values are defined by the build pipeline -ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_x64.zip" -ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/37996/metavms-server_update-5.1.2.37996-linux_arm64.zip" -ARG DOWNLOAD_VERSION="5.1.2.37996" +ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_x64.zip" +ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/38363/metavms-server_update-5.1.3.38363-linux_arm64.zip" +ARG DOWNLOAD_VERSION="5.1.3.38363" # NxWitness (networkoptix) or DWSpectrum (digitalwatchdog) or NxMeta (networkoptix-metavms) ARG RUNTIME_NAME="networkoptix-metavms" diff --git a/Make/nxwitness.docker b/Make/nxwitness.docker index 348027a..09bcff3 100644 --- a/Make/nxwitness.docker +++ b/Make/nxwitness.docker @@ -1,8 +1,8 @@ # Download URL and version # Current values are defined by the build pipeline -ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_x64.zip" -ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/37996/nxwitness-server_update-5.1.2.37996-linux_arm64.zip" -ARG DOWNLOAD_VERSION="5.1.2.37996" +ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_x64.zip" +ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/38363/nxwitness-server_update-5.1.3.38363-linux_arm64.zip" +ARG DOWNLOAD_VERSION="5.1.3.38363" # NxWitness (networkoptix) or DWSpectrum (digitalwatchdog) or NxMeta (networkoptix-metavms) ARG RUNTIME_NAME="networkoptix"