Skip to content

Commit

Permalink
rollback to dnf6 (open-telemetry#990)
Browse files Browse the repository at this point in the history
  • Loading branch information
austinlparker authored and AlexanderWert committed Jul 24, 2023
1 parent e261139 commit de6008a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/cartservice/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

# https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
FROM mcr.microsoft.com/dotnet/sdk:7.0.306 AS builder
FROM mcr.microsoft.com/dotnet/sdk:6.0.402 AS builder

WORKDIR /usr/src/app/

Expand All @@ -35,7 +35,7 @@ RUN \
# -----------------------------------------------------------------------------

# https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list
FROM mcr.microsoft.com/dotnet/runtime-deps:7.0.7-alpine3.17
FROM mcr.microsoft.com/dotnet/runtime-deps:6.0.9-alpine3.16

WORKDIR /usr/src/app/
COPY --from=builder /cartservice/ ./
Expand Down
2 changes: 1 addition & 1 deletion src/cartservice/src/cartservice.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/cartservice/tests/cartservice.tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit de6008a

Please sign in to comment.