From 0327d7065732d36010872cfddeeb5967221774ff Mon Sep 17 00:00:00 2001 From: Namu Date: Sat, 27 Dec 2025 01:06:54 +0100 Subject: [PATCH] Feat: Add docker support --- .dockerignore | 30 +++++++++++ WorkManagementTool.slnx | 3 ++ .../Components/Layout/NavMenu.razor | 6 --- .../Components/Pages/Auth.razor | 13 ----- .../Components/Pages/Home.razor | 4 +- .../SchoolSubject/SchoolSubjectDisplay.razor | 17 +++--- .../SchoolSubject/SchoolSubjectListing.razor | 6 +-- WorkManagementTool/Dockerfile | 30 +++++++++++ .../Properties/launchSettings.json | 51 +++++++++++------- WorkManagementTool/WorkManagementTool.csproj | 3 ++ WorkManagementTool/work_management.db | Bin 139264 -> 139264 bytes WorkManagementTool/work_management.db-shm | Bin 32768 -> 32768 bytes WorkManagementTool/work_management.db-wal | Bin 214272 -> 28872 bytes docker-compose.dcproj | 18 +++++++ docker-compose.override.yml | 14 +++++ docker-compose.yml | 6 +++ launchSettings.json | 11 ++++ 17 files changed, 158 insertions(+), 54 deletions(-) create mode 100644 .dockerignore delete mode 100644 WorkManagementTool/Components/Pages/Auth.razor create mode 100644 WorkManagementTool/Dockerfile create mode 100644 docker-compose.dcproj create mode 100644 docker-compose.override.yml create mode 100644 docker-compose.yml create mode 100644 launchSettings.json diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..fe1152b --- /dev/null +++ b/.dockerignore @@ -0,0 +1,30 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md +!**/.gitignore +!.git/HEAD +!.git/config +!.git/packed-refs +!.git/refs/heads/** \ No newline at end of file diff --git a/WorkManagementTool.slnx b/WorkManagementTool.slnx index 6b97fb0..8cdd1bd 100644 --- a/WorkManagementTool.slnx +++ b/WorkManagementTool.slnx @@ -1,3 +1,6 @@ + + + diff --git a/WorkManagementTool/Components/Layout/NavMenu.razor b/WorkManagementTool/Components/Layout/NavMenu.razor index 9fe43a8..e5ef83d 100644 --- a/WorkManagementTool/Components/Layout/NavMenu.razor +++ b/WorkManagementTool/Components/Layout/NavMenu.razor @@ -18,12 +18,6 @@ -
- - Auth Required - -
-
School Subjects diff --git a/WorkManagementTool/Components/Pages/Auth.razor b/WorkManagementTool/Components/Pages/Auth.razor deleted file mode 100644 index b7bbe6e..0000000 --- a/WorkManagementTool/Components/Pages/Auth.razor +++ /dev/null @@ -1,13 +0,0 @@ -@page "/auth" - -@using Microsoft.AspNetCore.Authorization - -@attribute [Authorize] - -Auth - -

You are authenticated

- - - Hello @context.User.Identity?.Name! - diff --git a/WorkManagementTool/Components/Pages/Home.razor b/WorkManagementTool/Components/Pages/Home.razor index 9001e0b..6960465 100644 --- a/WorkManagementTool/Components/Pages/Home.razor +++ b/WorkManagementTool/Components/Pages/Home.razor @@ -2,6 +2,6 @@ Home -

Hello, world!

+

Welcome to Work Management tool

-Welcome to your new app. +This application aims to help you with your work by managing task, homework and more ! diff --git a/WorkManagementTool/Components/SchoolSubject/SchoolSubjectDisplay.razor b/WorkManagementTool/Components/SchoolSubject/SchoolSubjectDisplay.razor index fdcfee6..a8bf36d 100644 --- a/WorkManagementTool/Components/SchoolSubject/SchoolSubjectDisplay.razor +++ b/WorkManagementTool/Components/SchoolSubject/SchoolSubjectDisplay.razor @@ -15,20 +15,18 @@ } else { -
- Name -
@schoolSubject.Name
+
+ Name +
@schoolSubject.Name
@if (!string.IsNullOrWhiteSpace(schoolSubject.Description)) { - Description: -
@schoolSubject.Description
+ Description: +
@schoolSubject.Description
} - Created At -
@schoolSubject.CreatedAt.ToLocalTime()
- - Actions + Created At +
@schoolSubject.CreatedAt.ToLocalTime()
} @@ -41,6 +39,5 @@ else protected override async Task OnInitializedAsync() { schoolSubject = await SchoolSubjectService.GetSchoolSubjectByIdAsync(Id); - } } diff --git a/WorkManagementTool/Components/SchoolSubject/SchoolSubjectListing.razor b/WorkManagementTool/Components/SchoolSubject/SchoolSubjectListing.razor index f79aa30..3ddd51f 100644 --- a/WorkManagementTool/Components/SchoolSubject/SchoolSubjectListing.razor +++ b/WorkManagementTool/Components/SchoolSubject/SchoolSubjectListing.razor @@ -11,7 +11,7 @@

SchoolSubjectListing

- + Create
@@ -22,10 +22,10 @@ } else { -
    +
      @foreach (var schoolSubject in schoolSubjects) { -
    • +
    • diff --git a/WorkManagementTool/Dockerfile b/WorkManagementTool/Dockerfile new file mode 100644 index 0000000..93c2529 --- /dev/null +++ b/WorkManagementTool/Dockerfile @@ -0,0 +1,30 @@ +# Consultez https://aka.ms/customizecontainer pour savoir comment personnaliser votre conteneur de débogage et comment Visual Studio utilise ce Dockerfile pour générer vos images afin d’accélérer le débogage. + +# Cet index est utilisé lors de l’exécution à partir de VS en mode rapide (par défaut pour la configuration de débogage) +FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base +USER $APP_UID +WORKDIR /app +EXPOSE 8080 +EXPOSE 8081 + + +# Cette phase est utilisée pour générer le projet de service +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build +ARG BUILD_CONFIGURATION=Release +WORKDIR /src +COPY ["WorkManagementTool/WorkManagementTool.csproj", "WorkManagementTool/"] +RUN dotnet restore "./WorkManagementTool/WorkManagementTool.csproj" +COPY . . +WORKDIR "/src/WorkManagementTool" +RUN dotnet build "./WorkManagementTool.csproj" -c $BUILD_CONFIGURATION -o /app/build + +# Cette étape permet de publier le projet de service à copier dans la phase finale +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "./WorkManagementTool.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false + +# Cette phase est utilisée en production ou lors de l’exécution à partir de VS en mode normal (par défaut quand la configuration de débogage n’est pas utilisée) +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "WorkManagementTool.dll"] \ No newline at end of file diff --git a/WorkManagementTool/Properties/launchSettings.json b/WorkManagementTool/Properties/launchSettings.json index 4a88e3e..cbe364b 100644 --- a/WorkManagementTool/Properties/launchSettings.json +++ b/WorkManagementTool/Properties/launchSettings.json @@ -1,23 +1,34 @@ { - "$schema": "https://json.schemastore.org/launchsettings.json", - "profiles": { - "http": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "http://localhost:5244", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } + "profiles": { + "http": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" }, - "https": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "https://localhost:7148;http://localhost:5244", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5244" + }, + "https": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "dotnetRunMessages": true, + "applicationUrl": "https://localhost:7148;http://localhost:5244" + }, + "Container (Dockerfile)": { + "commandName": "Docker", + "launchBrowser": true, + "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}", + "environmentVariables": { + "ASPNETCORE_HTTPS_PORTS": "8081", + "ASPNETCORE_HTTP_PORTS": "8080" + }, + "publishAllPorts": true, + "useSSL": true } - } + }, + "$schema": "https://json.schemastore.org/launchsettings.json" +} \ No newline at end of file diff --git a/WorkManagementTool/WorkManagementTool.csproj b/WorkManagementTool/WorkManagementTool.csproj index f9a8304..8f96da1 100644 --- a/WorkManagementTool/WorkManagementTool.csproj +++ b/WorkManagementTool/WorkManagementTool.csproj @@ -6,6 +6,8 @@ enable aspnet-WorkManagementTool-90e0550e-5565-441a-8092-c4b9b07d34cf true + Linux + ..\docker-compose.dcproj @@ -15,6 +17,7 @@ + diff --git a/WorkManagementTool/work_management.db b/WorkManagementTool/work_management.db index b4c2b836d38bd793aad21713a9d83e0c55d4d0fa..eb4ffef9b48aca583259b1788cce6d4d82cc15e3 100644 GIT binary patch delta 795 zcmZvZ&ubGw6vt;xBr(bEY%H;O8)GdZg-A(b9 z^e@q);K5>%Tnqja3WC>yRV;`Hy*Rtb#!BJw~y}bJTrCoiI?|zDytFQqTwR1AGnr!=m~Sju+AyP?S4au)B*JN(NlJF7hpxqNmIw z{UFLZZk%ErTUs4!SVvfIS-52yHEbJt-E36k47fTcF0T00bKJFUeAa9>Tb5a~?Ivy* z)?y(8Nv1qx2%4;-00~Wl0<&$oo2IXz$gxp7~qaH`M4H3zY&HBmbupcXV zP-zNwNwCXz=^kf38W0w6uiSP*RIg$*M7E7I)b96a*B_IFY$p>I)(PvML*Kt57eHmd zBKY%yfA4w3s~S~PFilH*nurC64@1U1vF;j*_TA&8AC*InhCb(eRJljA6vyuxr{^>z=YS&GA<_+DsH#}!JNtb00+A(D7F5+jV#HVu4sjC{yFyIK z2Vn0ABV$DcT|4p>Kp+MdB!mPD16{CPVMGxEz0=csy8r!uPxqE5>heTA{Pd*Tya;QX z&=2F;Eb;g6-jBj8MbDoqhigCs0KdV{@aU+c-NuW)fvT(17=%HkN3YQ9o?jklv1Fb z{dq*v$v8>cAHmka*FCtg$Q6w1+>uOL2HI8{U~}L#;AOCr1dj^mGvnRpchDagN_CzO z$_;`1f&c(qcS28vJ+K{wlXAwJLw`sfjDM{=)hy3zpu0X)aMRs7vQfwpThUD}ixCa-{^*#zAdS78fq z)f;-lYD#hNcn|hoK7h*dLbHSnRO5fbpI%Ga~~lkoTL3kqJm$ TW@Kh&U<31+Ss2)X3~OZo86hs7)o^(=vElqW5d|>ht&W&5N_)w=bRb&etE8H@80* zKMnqI{U~>n_pa62^G*M8iGGRZ?9ums=9)dvOKg;QGuFQ^@A&%r#_fIW-0lAx-&c;- z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+0D+1H9;B1m%w-`@vXr&F%)5N7*hA?x2`rcUKQ^+J{T$a+ zwps}gAV7cs0RjXF5FkK+009C72oNAZfB=Ci1*Y;a^XaCS7kQn{>}D??a#W?oq!hi9 zLAmFCI|n(Ll#k diff --git a/WorkManagementTool/work_management.db-wal b/WorkManagementTool/work_management.db-wal index ea492d6b1a6e3e425a595bfeff4cf4752a5f6e8d..ebebe2175106e9a039c59682b28f96c5f7036d54 100644 GIT binary patch literal 28872 zcmeI)&ui0Q7zgmI1MTK!=Sfjq^ld0QUy9y%n zIQ$EC@a#bx%D|I%@gykf*S!_V;n29{&de0uX=z z1Rwwb2tWV=5P$##c8$PHD{!EE(jUPY*(h_tAlDTXJ>Fv??-I=wY$7p9Af_UigcmK| z<870vvYj=@8$*If2fWE_*eL(ljTbhKhVx;6B*WpVInv(Kvq~i*+`3+Iq{hTVM6FDi z5hfJ!iquRMrMj6GQl^n+=jyfma7)ZgjknxVLQg~*&Papm!`E1NaInZORx6pboD?g1 z)~KdLNsm=28;;a!8KcC?wxwCTBr1fOnoJ~3aEN9}5)ml19sd}WZEI$t<3PFJA6>t5 zr>;d^Q{##3sXUQn%O;k?^F(E$EK*t3s4LcQjGIH#e&(eMMtG<)5HGBctjjs<6q~K6 zc!Q=#lk{v!ZBE8Bg`3%wTujGhPj3~9ZpO2w$5~|96~}T#O~~EWwNd?gGkQUeUL4C0 z4$@>g>0eUM(U_i(#uBw$reqlL6pO^FrF_0(TAt`go<&s6R){1>4pA-U5IEqc)C=~0Iler%@A3I=KNbkhbD{ar`}T1R2tWV=5P$##AOHafKmY;|fB*!x zUEp+QxnnbBn!u^fa@S^R8h%E{+F7mC1riGn4^JH=vp?$si(F_iw6yJ6;|3rA0SG_< z0uX=z1Rwwb2tWV=5cpStQ0K{xRdYB3J)Qkszh*Z0C++vQ6DxIr?w8-5M_;KmY;|fB*y_009U<00Izzz>X65TU}sHe}RwpU%N-?)GPEC*ip|AHv<6(KmY;| zfB*y_009Upil7`2t(^$>Bl}fB*y_009U<00Izz00bZaf&VG+ yxA_8V))CAvTz&UcxST^>;D0_6oEriVfB*y_009U<00Izz00bbgWdeV!3w#HxJ(iFF literal 214272 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 oVYA+M#)SX^2q1s}0tg_000Iaga4`# + + + 2.1 + Linux + 81dded9d-158b-e303-5f62-77a2896d2a5a + LaunchBrowser + {Scheme}://localhost:{ServicePort} + workmanagementtool + + + + docker-compose.yml + + + + + \ No newline at end of file diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 0000000..4e46293 --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,14 @@ +services: + workmanagementtool: + environment: + - ASPNETCORE_ENVIRONMENT=Development + - ASPNETCORE_HTTP_PORTS=8080 + - ASPNETCORE_HTTPS_PORTS=8081 + ports: + - "8080" + - "8081" + volumes: + - ${APPDATA}/Microsoft/UserSecrets:/home/app/.microsoft/usersecrets:ro + - ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro + - ${APPDATA}/ASP.NET/Https:/home/app/.aspnet/https:ro + - ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..3d59a99 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,6 @@ +services: + workmanagementtool: + image: ${DOCKER_REGISTRY-}workmanagementtool + build: + context: . + dockerfile: WorkManagementTool/Dockerfile diff --git a/launchSettings.json b/launchSettings.json new file mode 100644 index 0000000..e4e7548 --- /dev/null +++ b/launchSettings.json @@ -0,0 +1,11 @@ +{ + "profiles": { + "Docker Compose": { + "commandName": "DockerCompose", + "commandVersion": "1.0", + "serviceActions": { + "workmanagementtool": "StartDebugging" + } + } + } +} \ No newline at end of file