Skip to content

Commit

Permalink
Fix docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
szyb committed Dec 28, 2024
1 parent 29bd396 commit 7126dc7
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0'
dotnet-version: '9.0'
- name: Checkout repository
uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v2
with:
dotnet-version: 6.0.300
dotnet-version: 9.0.101
- name: Install dependencies
working-directory: ./src
run: dotnet restore Synopackage.sln
Expand Down
12 changes: 5 additions & 7 deletions src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Build runtime image #
#######################

FROM mcr.microsoft.com/dotnet/aspnet:6.0.4-bullseye-slim as base
FROM mcr.microsoft.com/dotnet/aspnet:9.0.0-bookworm-slim as base
WORKDIR /app
ENV ASPNETCORE_ENVIRONMENT docker
EXPOSE 80/tcp
EXPOSE 5000/tcp

##################
# Build frontend #
Expand All @@ -18,8 +18,7 @@ COPY Synopackage.Web .

RUN rm -rf wwwroot \
&& rm src/environments/environment.*.ts \
&& rm appsettings.*.json \
&& rm global.json
&& rm appsettings.*.json

COPY Synopackage.Web/src/environments/environment.ts src/environments
RUN true
Expand All @@ -37,7 +36,7 @@ RUN yarn --network-timeout 100000 \
# Build backend #
#################

FROM mcr.microsoft.com/dotnet/sdk:6.0.202-bullseye-slim as build-env
FROM mcr.microsoft.com/dotnet/sdk:9.0.101 as build-env
WORKDIR /app

COPY ["Synopackage.Web/Synopackage.Web.csproj", "Synopackage.Web/"]
Expand All @@ -51,8 +50,7 @@ RUN dotnet restore "Synopackage.Web/Synopackage.Web.csproj"
COPY . .
RUN rm -rf Synopackage.Web/wwwroot \
&& rm Synopackage.Web/src/environments/environment.*.ts \
&& rm Synopackage.Web/appsettings.*.json \
&& rm Synopackage.Web/global.json
&& rm Synopackage.Web/appsettings.*.json

COPY Synopackage.Web/appsettings.json Synopackage.Web/appsettings.json
RUN true
Expand Down
7 changes: 7 additions & 0 deletions src/Synopackage.Web/appsettings.docker.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{
"Kestrel": {
"EndPoints": {
"Http": {
"Url": "http://0.0.0.0:5000"
}
}
},
"AppSettings": {
"DefaultModel": "DS220+",
"DefaultVersion": "7.0.1-42218",
Expand Down

0 comments on commit 7126dc7

Please sign in to comment.