Skip to content

Commit

Permalink
ensure license and notice get packaged in docker container
Browse files Browse the repository at this point in the history
  • Loading branch information
Mpdreamz committed Nov 6, 2024
1 parent 96818a2 commit 0c83097
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ WORKDIR /src
COPY ["src/Elastic.Markdown/Elastic.Markdown.csproj", "src/Elastic.Markdown/Elastic.Markdown.csproj"]
COPY ["src/docs-builder/docs-builder.csproj", "src/docs-builder/docs-builder.csproj"]
COPY ["docs/docs.csproj", "docs/docs.csproj"]
COPY "build/build.csproj" "build/build.csproj"
COPY ".github/.github.csproj" ".github/.github.csproj"
COPY "tests/Elastic.Markdown.Tests/Elastic.Markdown.Tests.csproj" "tests/Elastic.Markdown.Tests/Elastic.Markdown.Tests.csproj"
COPY ["docs-builder.sln", "docs-builder.sln"]
RUN dotnet restore "docs-builder.sln"
COPY . .
Expand Down Expand Up @@ -44,6 +47,8 @@ RUN adduser --disabled-password \
USER dotnetuser
WORKDIR /app

COPY NOTICE.txt .
COPY LICENSE.txt .
COPY --from=publish /app/publish .
CMD chmod +x docs-builder

Expand Down
6 changes: 3 additions & 3 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
</PropertyGroup>

<ItemGroup>
<Content Include="(SolutionRoot)/build/nuget-icon.png" Pack="True" Link="nuget-icon.png" PackagePath="nuget-icon.png" CopyToOutputDirectory="PreserveNewest" />
<None Include="(SolutionRoot)/LICENSE.txt" Pack="True" PackagePath="LICENSE.txt" CopyToOutputDirectory="PreserveNewest" />
<None Include="$(SolutionRoot)/NOTICE.txt" CopyToOutputDirectory="PreserveNewest" Pack="True" PackagePath="NOTICE.txt" />
<Content Include="$(SolutionRoot)\build\nuget-icon.png" Pack="True" Link="nuget-icon.png" PackagePath="nuget-icon.png" CopyToOutputDirectory="PreserveNewest" />
<None Include="$(SolutionRoot)\LICENSE.txt" Pack="True" PackagePath="LICENSE.txt" CopyToOutputDirectory="PreserveNewest" />
<None Include="$(SolutionRoot)\NOTICE.txt" Pack="True" PackagePath="NOTICE.txt" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 0c83097

Please sign in to comment.