From 0f82fb6ac60ad07914b5f8060425dd738ebca5ff Mon Sep 17 00:00:00 2001 From: darrenge Date: Fri, 26 Apr 2024 16:20:14 -0700 Subject: [PATCH] Added (#335) COPY Directory.Build.props Directory.Build.props COPY Directory.Packages.props Directory.Packages.props So works with new .csproj changes --- Dockerfile | 2 ++ Dockerfile.alpine | 2 ++ Dockerfile.cbl-mariner | 2 ++ Dockerfile.chiseled | 2 ++ Dockerfile.ubuntu | 2 ++ 5 files changed, 10 insertions(+) diff --git a/Dockerfile b/Dockerfile index 342fb5b346..2cf0580451 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,8 @@ COPY libs/storage/Tsavorite/cs/src/core/*.csproj libs/storage/Tsavorite/cs/src/c COPY libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/*.csproj libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/ COPY main/GarnetServer/*.csproj main/GarnetServer/ COPY metrics/HdrHistogram/*.csproj metrics/HdrHistogram/ +COPY Directory.Build.props Directory.Build.props +COPY Directory.Packages.props Directory.Packages.props RUN dotnet restore main/GarnetServer/GarnetServer.csproj -a $TARGETARCH diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 7ed52cc56f..6ebb3255ae 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -12,6 +12,8 @@ COPY libs/storage/Tsavorite/cs/src/core/*.csproj libs/storage/Tsavorite/cs/src/c COPY libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/*.csproj libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/ COPY main/GarnetServer/*.csproj main/GarnetServer/ COPY metrics/HdrHistogram/*.csproj metrics/HdrHistogram/ +COPY Directory.Build.props Directory.Build.props +COPY Directory.Packages.props Directory.Packages.props RUN dotnet restore main/GarnetServer/GarnetServer.csproj -a $TARGETARCH diff --git a/Dockerfile.cbl-mariner b/Dockerfile.cbl-mariner index cf0e1ef0e5..eb995919df 100644 --- a/Dockerfile.cbl-mariner +++ b/Dockerfile.cbl-mariner @@ -12,6 +12,8 @@ COPY libs/storage/Tsavorite/cs/src/core/*.csproj libs/storage/Tsavorite/cs/src/c COPY libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/*.csproj libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/ COPY main/GarnetServer/*.csproj main/GarnetServer/ COPY metrics/HdrHistogram/*.csproj metrics/HdrHistogram/ +COPY Directory.Build.props Directory.Build.props +COPY Directory.Packages.props Directory.Packages.props RUN dotnet restore main/GarnetServer/GarnetServer.csproj -a $TARGETARCH diff --git a/Dockerfile.chiseled b/Dockerfile.chiseled index 6545c2b6aa..ce046e3ac1 100644 --- a/Dockerfile.chiseled +++ b/Dockerfile.chiseled @@ -12,6 +12,8 @@ COPY libs/storage/Tsavorite/cs/src/core/*.csproj libs/storage/Tsavorite/cs/src/c COPY libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/*.csproj libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/ COPY main/GarnetServer/*.csproj main/GarnetServer/ COPY metrics/HdrHistogram/*.csproj metrics/HdrHistogram/ +COPY Directory.Build.props Directory.Build.props +COPY Directory.Packages.props Directory.Packages.props RUN dotnet restore main/GarnetServer/GarnetServer.csproj -a $TARGETARCH diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 3fac8467dc..ac37b0b3b3 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -12,6 +12,8 @@ COPY libs/storage/Tsavorite/cs/src/core/*.csproj libs/storage/Tsavorite/cs/src/c COPY libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/*.csproj libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/ COPY main/GarnetServer/*.csproj main/GarnetServer/ COPY metrics/HdrHistogram/*.csproj metrics/HdrHistogram/ +COPY Directory.Build.props Directory.Build.props +COPY Directory.Packages.props Directory.Packages.props RUN dotnet restore main/GarnetServer/GarnetServer.csproj -a $TARGETARCH