Skip to content

Commit

Permalink
Minor changes to docker build files and assembly version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
@kibblewhite
kibblewhite committed Feb 29, 2024
1 parent 930e4a7 commit ce2bb6b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Client/Client.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<Nullable>enable</Nullable>
<AssemblyName>HashiVaultCs</AssemblyName>
<RootNamespace>HashiVaultCs</RootNamespace>
<Version>1.1.1.5</Version>
<Version>1.1.1.6</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<Authors>kibblewhite &lt;kibblewhite@live.com&gt;</Authors>
<Description>A .NET library for interacting with HashiCorp Vault. Features are minimal, please read documentation.</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>csharp-vault-hashicorp.png</PackageIcon>
<RepositoryUrl>https://github.com/kibblewhite/HashiVaultCs</RepositoryUrl>
<PackageTags>HashiCorp;Vault;</PackageTags>
<AssemblyVersion>1.1.1.5</AssemblyVersion>
<FileVersion>1.1.1.5</FileVersion>
<AssemblyVersion>1.1.1.6</AssemblyVersion>
<FileVersion>1.1.1.6</FileVersion>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<ApplicationIcon>csharp-vault-hashicorp.ico</ApplicationIcon>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.build.arm64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ RUN dotnet restore "Client/Client.csproj"
COPY . .

WORKDIR "/src-arm64/Client"
RUN dotnet build "Client.csproj" --os linux -a arm64 -c Release -o /app/build-arm64/bin/Release/net7.0/linux-arm64
RUN dotnet build "Client.csproj" --os win -a arm64 -c Release -o /app/build-arm64/bin/Release/net7.0/win-arm64
RUN dotnet build "Client.csproj" --os linux -a arm64 -c Release -o /app/build-arm64/bin/Release/net8.0/linux-arm64
RUN dotnet build "Client.csproj" --os win -a arm64 -c Release -o /app/build-arm64/bin/Release/net8.0/win-arm64

FROM build-arm64 AS publish-arm64
RUN dotnet publish "Client.csproj" --os linux -a arm64 -c Release -o /app/publish-arm64/bin/Release/net7.0/linux-arm64
RUN dotnet publish "Client.csproj" --os win -a arm64 -c Release -o /app/publish-arm64/bin/Release/net7.0/win-arm64
RUN dotnet publish "Client.csproj" --os linux -a arm64 -c Release -o /app/publish-arm64/bin/Release/net8.0/linux-arm64
RUN dotnet publish "Client.csproj" --os win -a arm64 -c Release -o /app/publish-arm64/bin/Release/net8.0/win-arm64

FROM base-arm64 AS final-arm64
WORKDIR /app
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.build.x64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ RUN dotnet restore "Client/Client.csproj"
COPY . .

WORKDIR "/src-x64/Client"
RUN dotnet build "Client.csproj" --os linux -a x64 -c Release -o /app/build-x64/bin/Release/net7.0/linux-x64
RUN dotnet build "Client.csproj" --os win -a x64 -c Release -o /app/build-x64/bin/Release/net7.0/win-x64
RUN dotnet build "Client.csproj" --os linux -a x64 -c Release -o /app/build-x64/bin/Release/net8.0/linux-x64
RUN dotnet build "Client.csproj" --os win -a x64 -c Release -o /app/build-x64/bin/Release/net8.0/win-x64

FROM build-x64 AS publish-x64
RUN dotnet publish "Client.csproj" --os linux -a x64 -c Release -o /app/publish-x64/bin/Release/net7.0/linux-x64
RUN dotnet publish "Client.csproj" --os win -a x64 -c Release -o /app/publish-x64/bin/Release/net7.0/win-x64
RUN dotnet publish "Client.csproj" --os linux -a x64 -c Release -o /app/publish-x64/bin/Release/net8.0/linux-x64
RUN dotnet publish "Client.csproj" --os win -a x64 -c Release -o /app/publish-x64/bin/Release/net8.0/win-x64

FROM base-x64 AS final-x64
WORKDIR /app
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.nuget.publish
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ RUN dotnet restore "Client/Client.csproj"
COPY . .

WORKDIR "/src-x64/Client"
RUN dotnet build "Client.csproj" -c Release -o /app/build-x64/bin/Release/net7.0
RUN dotnet pack "Client.csproj" -c Release -o /app/build-x64/bin/Release/net7.0/publish
RUN dotnet nuget push /app/build-x64/bin/Release/net6.0/publish/HashiVaultCs.*.nupkg -s $NUGET_URL -k $NUGET_KEY
RUN dotnet build "Client.csproj" -c Release -o /app/build-x64/bin/Release/net8.0
RUN dotnet pack "Client.csproj" -c Release -o /app/build-x64/bin/Release/net8.0/publish
RUN dotnet nuget push /app/build-x64/bin/Release/net8.0/publish/HashiVaultCs.*.nupkg -s $NUGET_URL -k $NUGET_KEY

0 comments on commit ce2bb6b

Please sign in to comment.