diff --git a/.gitignore b/.gitignore index 270e942..28c9b47 100644 --- a/.gitignore +++ b/.gitignore @@ -16,13 +16,13 @@ /Back/skydiveLogs-api.Business/bin /Back/dist /Back/skydiveLogs-api.v3.ncrunchsolution.user -/Back/skydiveLogs-api/Data/Init/twinOtter.jpg -/Back/skydiveLogs-api/Data/Init/skyvan.jpg -/Back/skydiveLogs-api/Data/Init/Pilatus.png -/Back/skydiveLogs-api/Data/Init/pac.jpg -/Back/skydiveLogs-api/Data/Init/dornier.jpg -/Back/skydiveLogs-api/Data/Init/casa.jpg -/Back/skydiveLogs-api/Data/Init/caravan.jpg -/Back/skydiveLogs-api/Data/Init/206.jpg +/Back/skydiveLogs-api/Init/twinOtter.jpg +/Back/skydiveLogs-api/Init/skyvan.jpg +/Back/skydiveLogs-api/Init/Pilatus.png +/Back/skydiveLogs-api/Init/pac.jpg +/Back/skydiveLogs-api/Init/dornier.jpg +/Back/skydiveLogs-api/Init/casa.jpg +/Back/skydiveLogs-api/Init/caravan.jpg +/Back/skydiveLogs-api/Init/206.jpg /Back/skydiveLogs-api/Data/__JumpsDb.db /Back/skydiveLogs-api/Data/_JumpsDb.db diff --git a/Back/skydiveLogs-api.Business/InitDbService.cs b/Back/skydiveLogs-api.Business/InitDbService.cs index 7d48de2..d50de27 100644 --- a/Back/skydiveLogs-api.Business/InitDbService.cs +++ b/Back/skydiveLogs-api.Business/InitDbService.cs @@ -28,7 +28,7 @@ namespace skydiveLogs_api.Business private void LoadDropZones() { - var jsonString = File.ReadAllText("Data/Init/dropZone.json"); + var jsonString = File.ReadAllText("Init/dropZone.json"); var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, @@ -44,7 +44,7 @@ namespace skydiveLogs_api.Business private void LoadJumpTypes() { - var jsonString = File.ReadAllText("Data/Init/jumpType.json"); + var jsonString = File.ReadAllText("Init/jumpType.json"); var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, @@ -60,7 +60,7 @@ namespace skydiveLogs_api.Business private void LoadAircrafts() { - var jsonString = File.ReadAllText("Data/Init/aircraft.json"); + var jsonString = File.ReadAllText("Init/aircraft.json"); var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db index d624e01..f06fa07 100644 Binary files a/Back/skydiveLogs-api/Data/JumpsDb-log.db and b/Back/skydiveLogs-api/Data/JumpsDb-log.db differ diff --git a/Back/skydiveLogs-api/Data/Init/aircraft.json b/Back/skydiveLogs-api/Init/aircraft.json similarity index 100% rename from Back/skydiveLogs-api/Data/Init/aircraft.json rename to Back/skydiveLogs-api/Init/aircraft.json diff --git a/Back/skydiveLogs-api/Data/Init/dropZone.json b/Back/skydiveLogs-api/Init/dropZone.json similarity index 100% rename from Back/skydiveLogs-api/Data/Init/dropZone.json rename to Back/skydiveLogs-api/Init/dropZone.json diff --git a/Back/skydiveLogs-api/Data/Init/jumpType.json b/Back/skydiveLogs-api/Init/jumpType.json similarity index 100% rename from Back/skydiveLogs-api/Data/Init/jumpType.json rename to Back/skydiveLogs-api/Init/jumpType.json diff --git a/Back/skydiveLogs-api/toto.txt b/Back/skydiveLogs-api/toto.txt new file mode 100644 index 0000000..6f708e6 --- /dev/null +++ b/Back/skydiveLogs-api/toto.txt @@ -0,0 +1 @@ +1totoTOTO2 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..28312be --- /dev/null +++ b/Dockerfile @@ -0,0 +1,28 @@ +#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. + +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base +WORKDIR /app +EXPOSE 80 + +RUN apt-get -y update +RUN apt-get -y install nginx + +RUN mkdir /app/Front +RUN mkdir /app/API + +WORKDIR /app/Front +COPY Front/skydivelogs-app/dist . + +WORKDIR /app/API +COPY Back/dist . + +COPY start-docker.sh /start-docker.sh +RUN chmod +x /start-docker.sh + +RUN update-rc.d nginx defaults + +COPY nginx.conf /etc/nginx/sites-available/default + +#VOLUME /app/API/Data + +CMD ["/start-docker.sh"] \ No newline at end of file diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 0000000..152bc55 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,14 @@ +server { + listen 80; + listen [::]:80; + + server_name _; + + root /app/Front; + index index.html; + + location /api { + include proxy_params; + proxy_pass http://localhost:5001; + } +} diff --git a/start-docker.sh b/start-docker.sh new file mode 100644 index 0000000..1005408 --- /dev/null +++ b/start-docker.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +service nginx start + +cd /app/API/ +dotnet skydiveLogs-api.dll --verbose d --urls=http://localhost:5001 \ No newline at end of file