diff --git a/myBlazorApp/myBlazorApp/.drone.yml b/myBlazorApp/myBlazorApp/.drone.yml index e390d08..96e212d 100644 --- a/myBlazorApp/myBlazorApp/.drone.yml +++ b/myBlazorApp/myBlazorApp/.drone.yml @@ -1,76 +1,24 @@ kind: pipeline type: docker - - -#steps : - -# - name: build -# image: mcr.microsoft.com/dotnet/sdk:6.0 -# commands: -# - cd myBlazorApp/ -# - dotnet restore myBlazorApp.sln -# - dotnet build myBlazorApp.sln -c Release --no-restore - - -# - name: tests -# image: mcr.microsoft.com/dotnet/sdk:6.0 -# commands: -# - cd myBlazorApp/ -# - dotnet restore myBlazorApp.sln -# - dotnet test myBlazorApp.sln --no-restore -# depends_on: [build] - -# - name: code-analysis -# image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dronesonarplugin-dotnet6 -# commands: -# - cd myBlazorApp/ -# - dotnet restore myBlazorApp.sln -# - dotnet sonarscanner begin /k:$REPO_NAME /d:sonar.host.url=$$$${PLUGIN_SONAR_HOST} /d:sonar.coverageReportPaths="coveragereport/SonarQube.xml" /d:sonar.coverage.exclusions="Tests/**" /d:sonar.login=$$$${PLUGIN_SONAR_TOKEN} -# - dotnet build myBlazorApp.sln -c Release --no-restore -# - dotnet test myBlazorApp.sln --logger trx --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --collect "XPlat Code Coverage" -# - reportgenerator -reports:"**/coverage.cobertura.xml" -reporttypes:SonarQube -targetdir:"coveragereport" -# - dotnet publish myBlazorApp.sln -c Release --no-restore -o $CI_PROJECT_DIR/build/release -# - dotnet sonarscanner end /d:sonar.login=$$$${PLUGIN_SONAR_TOKEN} -# secrets: [ SECRET_SONAR_LOGIN ] -# settings: -# # accessible en ligne de commande par $${PLUGIN_SONAR_HOST} -# sonar_host: https://codefirst.iut.uca.fr/sonar/ -# # accessible en ligne de commande par $${PLUGIN_SONAR_TOKEN} -# sonar_token: -# from_secret: SECRET_SONAR_LOGIN -# depends_on: [tests] - - -## - name: generate-and-deploy-docs -## image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-docdeployer -## failure: ignore -## volumes: -## - name: docs -## path: /docs -## commands: -## - /entrypoint.sh -## when: -## branch: -## - master -## depends_on: [ build ] - -### The volumes declaration appear at the end of the file, after all steps -##volumes: -##- name: docs -## temp: {} - - -# - name: docker-build -# image: plugins/docker -# settings: -# dockerfile: myBlazorApp/myBlazorApp/Dockerfile -# context: . -# registry: hub.codefirst.iut.uca.fr -# repo: hub.codefirst.iut.uca.fr/lucie.bedouret/blazorCourse -# username: -# from_secret: SECRET_REGISTRY_USERNAME -# password: -# from_secret: SECRET_REGISTRY_PASSWORD -# when: -# branch: -# - master \ No newline at end of file +name: blazor + +trigger: + event: + - push + +steps: + - name: build + image: mcr.microsoft.com/dotnet/sdk:6.0 + commands: + - cd ../ + - dotnet restore myBlazorApp.sln + - dotnet build myBlazorApp.sln -c Release --no-restore + + + - name: tests + image: mcr.microsoft.com/dotnet/sdk:6.0 + commands: + - cd ../ + - dotnet restore myBlazorApp.sln + - dotnet test myBlazorApp.sln --no-restore + diff --git a/myBlazorApp/myBlazorApp/Dockerfile b/myBlazorApp/myBlazorApp/Dockerfile index af5bca8..d2ec007 100644 --- a/myBlazorApp/myBlazorApp/Dockerfile +++ b/myBlazorApp/myBlazorApp/Dockerfile @@ -1,26 +1,23 @@ -##See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -# -##Depending on the operating system of the host machines(s) that will build or run the containers, the image specified in the FROM statement may need to be changed. -##For more information, please see https://aka.ms/containercompat -# -#FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base -#WORKDIR /app -#EXPOSE 80 -#EXPOSE 443 -# -#FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build -#WORKDIR /src -#COPY ["nuget.config", "."] -#COPY ["myBlazorApp/myBlazorApp.csproj", "myBlazorApp/"] -#RUN dotnet restore "myBlazorApp/myBlazorApp.csproj" -#COPY . . -#WORKDIR "/src/myBlazorApp" -#RUN dotnet build "myBlazorApp.csproj" -c Release -o /app/build -# -#FROM build AS publish -#RUN dotnet publish "myBlazorApp.csproj" -c Release -o /app/publish -# -#FROM base AS final -#WORKDIR /app -#COPY --from=publish /app/publish . -#ENTRYPOINT ["dotnet", "myBlazorApp.dll"] \ No newline at end of file +#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/aspnet:6.0 AS base +WORKDIR /app +EXPOSE 80 +EXPOSE 443 + +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build +WORKDIR /src +COPY ["nuget.config", "."] +COPY ["myBlazorApp/myBlazorApp.csproj", "myBlazorApp/"] +RUN dotnet restore "myBlazorApp/myBlazorApp.csproj" +COPY . . +WORKDIR "/src/myBlazorApp" +RUN dotnet build "myBlazorApp.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "myBlazorApp.csproj" -c Release -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "myBlazorApp.dll"] \ No newline at end of file diff --git a/myBlazorApp/myBlazorApp/myBlazorApp.csproj b/myBlazorApp/myBlazorApp/myBlazorApp.csproj index a37021c..28142bc 100644 --- a/myBlazorApp/myBlazorApp/myBlazorApp.csproj +++ b/myBlazorApp/myBlazorApp/myBlazorApp.csproj @@ -5,7 +5,7 @@ enable enable 57709e34-c352-46a7-8d9f-219f603ebc3d - Windows + Linux