Docker update

2 files changed, 16 insertions, 24 deletions

diff --git a/Dockerfile b/Dockerfile
index 183e8d9..d643703 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,15 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /app
-
-COPY . ./
-RUN dotnet restore
-RUN dotnet tool restore
-RUN dotnet libman restore
-RUN dotnet ef database update --context DataContext
-RUN dotnet ef database update --context IdentityContext
+FROM mcr.microsoft.com/dotnet/sdk:8.0-jammy AS build
+WORKDIR /source
 
-RUN dotnet publish -c Release -o out
+COPY . .
+RUN dotnet restore && \
+    dotnet tool restore && \
+    dotnet libman restore
+RUN dotnet publish --property:OutputPath=/app
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy
 EXPOSE 5000
 WORKDIR /app
-COPY  --from=build /app/out .
-COPY --from=build /app/Database ./Database
+COPY  --from=build /app .
 ENV ASPNETCORE_ENVIRONMENT Production
-ENTRYPOINT [ "dotnet", "MyDarling.dll", "--urls=http://0.0.0.0:5000" ]
\ No newline at end of file
+ENTRYPOINT [ "./MyDarling", "--urls=http://0.0.0.0:5000" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index dae7f88..728c420 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,13 @@
 version: '3'
 
 services:
-  my-darling:
-    image: gitea.cebotari.ru/chebser/mydarling-dotnet:latest
+  my-darling-test:
+    build: .
     container_name: mydarling-dotnet
     ports:
-      - "5050:5000"
+      - "5000:5000"
     volumes:
-      - db:/app/Database
-      - content:/app/wwwroot/Content
+      - ./Database:/app/Database
+      - ./wwwroot/Content:/app/wwwroot/Content
     environment:
-      - ADMIN_PASSWORD=He110World!
-
-volumes:
-  db:
-  content:
\ No newline at end of file
+      - ADMIN_PASSWORD=He110World!
\ No newline at end of file