From cf21bd461fdbe4df0761f42bed6326813ce14feb Mon Sep 17 00:00:00 2001 From: Badrish Chandramouli Date: Sat, 12 Oct 2024 12:14:47 -0700 Subject: [PATCH] Fix Docker releases (#718) * Update Dockerfile * Update Dockerfile.alpine * Update Dockerfile.cbl-mariner * Update Dockerfile.chiseled * Update Dockerfile.ubuntu * update version for release --- .azure/pipelines/azure-pipelines-external-release.yml | 4 ++-- Dockerfile | 1 + Dockerfile.alpine | 1 + Dockerfile.cbl-mariner | 1 + Dockerfile.chiseled | 1 + Dockerfile.ubuntu | 1 + libs/host/GarnetServer.cs | 6 +++--- 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.azure/pipelines/azure-pipelines-external-release.yml b/.azure/pipelines/azure-pipelines-external-release.yml index 94120af1b4..a8a1dd947a 100644 --- a/.azure/pipelines/azure-pipelines-external-release.yml +++ b/.azure/pipelines/azure-pipelines-external-release.yml @@ -1,9 +1,9 @@ ###################################### # NOTE: Before running this pipeline to generate a new nuget package, update the version string in two places # 1) update the name: string below (line 6) -- this is the version for the nuget package (e.g. 1.0.0) -# 2) update \libs\host\GarnetServer.cs readonly string version (~line 53) -- NOTE - these two values need to be the same +# 2) update \libs\host\GarnetServer.cs readonly string version (~line 32) -- NOTE - these two values need to be the same ###################################### -name: 1.0.31 +name: 1.0.32 trigger: branches: include: diff --git a/Dockerfile b/Dockerfile index ef8827f1a3..15336aedbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ COPY libs/cluster/*.csproj libs/cluster/ COPY libs/common/*.csproj libs/common/ COPY libs/host/*.csproj libs/host/ COPY libs/server/*.csproj libs/server/ +COPY libs/resources/*.csproj libs/resources/ COPY libs/storage/Tsavorite/cs/src/core/*.csproj libs/storage/Tsavorite/cs/src/core/ COPY libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/*.csproj libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/ COPY main/GarnetServer/*.csproj main/GarnetServer/ diff --git a/Dockerfile.alpine b/Dockerfile.alpine index a115823fab..e2e2262ac6 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -8,6 +8,7 @@ COPY libs/cluster/*.csproj libs/cluster/ COPY libs/common/*.csproj libs/common/ COPY libs/host/*.csproj libs/host/ COPY libs/server/*.csproj libs/server/ +COPY libs/resources/*.csproj libs/resources/ COPY libs/storage/Tsavorite/cs/src/core/*.csproj libs/storage/Tsavorite/cs/src/core/ COPY libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/*.csproj libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/ COPY main/GarnetServer/*.csproj main/GarnetServer/ diff --git a/Dockerfile.cbl-mariner b/Dockerfile.cbl-mariner index 97629488f6..3b22c84d30 100644 --- a/Dockerfile.cbl-mariner +++ b/Dockerfile.cbl-mariner @@ -8,6 +8,7 @@ COPY libs/cluster/*.csproj libs/cluster/ COPY libs/common/*.csproj libs/common/ COPY libs/host/*.csproj libs/host/ COPY libs/server/*.csproj libs/server/ +COPY libs/resources/*.csproj libs/resources/ COPY libs/storage/Tsavorite/cs/src/core/*.csproj libs/storage/Tsavorite/cs/src/core/ COPY libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/*.csproj libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/ COPY main/GarnetServer/*.csproj main/GarnetServer/ diff --git a/Dockerfile.chiseled b/Dockerfile.chiseled index 9a70576c22..31a1f63124 100644 --- a/Dockerfile.chiseled +++ b/Dockerfile.chiseled @@ -12,6 +12,7 @@ COPY libs/cluster/*.csproj libs/cluster/ COPY libs/common/*.csproj libs/common/ COPY libs/host/*.csproj libs/host/ COPY libs/server/*.csproj libs/server/ +COPY libs/resources/*.csproj libs/resources/ COPY libs/storage/Tsavorite/cs/src/core/*.csproj libs/storage/Tsavorite/cs/src/core/ COPY libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/*.csproj libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/ COPY main/GarnetServer/*.csproj main/GarnetServer/ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 69956ce040..29b4014d8a 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -8,6 +8,7 @@ COPY libs/cluster/*.csproj libs/cluster/ COPY libs/common/*.csproj libs/common/ COPY libs/host/*.csproj libs/host/ COPY libs/server/*.csproj libs/server/ +COPY libs/resources/*.csproj libs/resources/ COPY libs/storage/Tsavorite/cs/src/core/*.csproj libs/storage/Tsavorite/cs/src/core/ COPY libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/*.csproj libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/ COPY main/GarnetServer/*.csproj main/GarnetServer/ diff --git a/libs/host/GarnetServer.cs b/libs/host/GarnetServer.cs index 141cbe364c..32555a45ed 100644 --- a/libs/host/GarnetServer.cs +++ b/libs/host/GarnetServer.cs @@ -28,6 +28,9 @@ namespace Garnet /// public class GarnetServer : IDisposable { + // IMPORTANT: Keep the version in sync with .azure\pipelines\azure-pipelines-external-release.yml line ~6. + readonly string version = "1.0.32"; + internal GarnetProvider Provider; private readonly GarnetServerOptions opts; @@ -51,9 +54,6 @@ public class GarnetServer : IDisposable /// protected StoreWrapper storeWrapper; - // IMPORTANT: Keep the version in sync with .azure\pipelines\azure-pipelines-external-release.yml line ~6. - readonly string version = "1.0.31"; - /// /// Resp protocol version ///