Skip to content

Commit 2015160

Browse files
authored
Merge pull request #501 from classtranscribe/Undo10
undo dotnet10 attempt
2 parents 68660cc + 5624686 commit 2015160

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

API.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414

1515
#FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim-amd64 as build
16-
#FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
17-
FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build
16+
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
17+
#notyet FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build
1818
# See https://mcr.microsoft.com/en-us/product/dotnet/sdk/tags
1919

2020
# Running the AMD64 version is of the SDK is broken
@@ -42,8 +42,8 @@ COPY ./ClassTranscribeDatabase ./ClassTranscribeDatabase
4242
WORKDIR /src/ClassTranscribeServer
4343
RUN dotnet publish ClassTranscribeServer.csproj -c Release -o /app --no-restore
4444

45-
FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble AS publish_base
46-
#FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim as publish_base
45+
#Not yet FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble AS publish_base
46+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim as publish_base
4747
# FROM mcr.microsoft.com/dotnet/aspnet:7.0.14-bookworm-slim as publish_base
4848

4949
# FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.3-bionic as publish_base

TaskEngine.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim as build
2-
FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim as build
2+
#not yet FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build
33
# See https://mcr.microsoft.com/en-us/product/dotnet/sdk/tags
44
#See more comments in API.Dockerfile
55
# RUN ls
@@ -25,16 +25,16 @@ COPY ./TaskEngine ./TaskEngine
2525
WORKDIR /src/TaskEngine
2626
RUN dotnet publish TaskEngine.csproj -c Release -o /app --no-restore
2727

28-
#old FROM mcr.microsoft.com/dotnet/aspnet:8.0 as publish_base
29-
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS publish_base
28+
FROM mcr.microsoft.com/dotnet/aspnet:8.0 as publish_base
29+
#notyet FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS publish_base
3030
# https://hub.docker.com/_/microsoft-dotnet-aspnet/
3131

3232
# force AMD64 build here: the ssl1.1.1 workaround below assumes amd64
3333
# Install prerequisites for Azure Speech Services: build-essential libssl-dev ca-certificates libasound2 wget
3434
# See https://docs.microsoft.com/en-us/azure/cognitive-services/speech-service/quickstarts/setup-platform
3535
# 10.0 libasound2 replaced with libasound2t64
3636

37-
RUN apt-get update && apt-get install -y build-essential libssl-dev ca-certificates libasound2t64 wget && \
37+
RUN apt-get update && apt-get install -y build-essential libssl-dev ca-certificates libasound2 wget && \
3838
apt-get install -y netcat-traditional && apt-get -q update
3939

4040
# Microsoft 8.0 issue: https://github.com/Azure-Samples/cognitive-services-speech-sdk/issues/2204

0 commit comments

Comments
 (0)