summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/dotnet-tools.json6
-rw-r--r--.dockerignore6
-rw-r--r--Dockerfile1
-rw-r--r--docker-compose.yml10
4 files changed, 15 insertions, 8 deletions
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index f331fe5..854a50a 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -7,6 +7,12 @@
"commands": [
"dotnet-ef"
]
+ },
+ "microsoft.web.librarymanager.cli": {
+ "version": "2.1.175",
+ "commands": [
+ "libman"
+ ]
}
}
} \ No newline at end of file
diff --git a/.dockerignore b/.dockerignore
index f11c5d6..cf1e89e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,8 @@
# database file
Database/MyDarlingDb.db
Database/MyDarlingDb.db-shm
-Database/MyDarlingDb.db-wal \ No newline at end of file
+Database/MyDarlingDb.db-wal
+
+# wwwroot
+wwwroot/lib
+wwwroot/content \ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 10afed7..a2622e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /app
COPY . ./
RUN dotnet restore
RUN dotnet tool restore
+RUN dotnet libman restore
RUN dotnet ef database update
RUN dotnet publish -c Release -o out
diff --git a/docker-compose.yml b/docker-compose.yml
index a683f15..707050c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,14 +2,10 @@ version: '3'
services:
my-darling:
- build: .
+ image: gitea.cebotari.ru/chebser/mydarling-dotnet:latest
container_name: mydarling-net
ports:
- "5050:5000"
volumes:
- - mydarling-db:/app/Database
- - mydarling-wwwroot:/app/wwwroot
-
-volumes:
- mydarling-db:
- mydarling-wwwroot: \ No newline at end of file
+ - ./Database:/app/Database
+ - ./content:/app/wwwroot/content \ No newline at end of file