Merge pull request #221 from AndrewCS149/testWorkflow

testWorkflow

Author: The-DevBlog

docker-compose.yml

@@ -29,6 +29,12 @@ services:
    image: ${DEVBLOG_SERVER_CONTAINER_NAME}
    build: ./server
    container_name: ${DEVBLOG_SERVER_CONTAINER_NAME}
+   environment: 
+     - ASPNETCORE_CERT_PASSWORD=${ASPNETCORE_CERT_PASSWORD}
+     - ASPNETCORE_CERT_PATH=${ASPNETCORE_CERT_PATH}
+     - ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT}
+     - ASPNETCORE_HTTPS_PORTS=${ASPNETCORE_HTTPS_PORTS}
+     - ASPNETCORE_HTTP_PORTS=${ASPNETCORE_HTTP_PORTS}
    volumes:
      - ${SERVER_PUBLISH_VOLUME}
      - ${SERVER_HTTPS_VOLUME}

server/Dockerfile

@@ -1,6 +1,5 @@
 FROM mcr.microsoft.com/dotnet/aspnet:8.0
 EXPOSE 8080
-EXPOSE 80
 EXPOSE 8081
 WORKDIR /app/publish
 ENTRYPOINT ["dotnet", "devblog.dll"]

server/Program.cs

@@ -27,12 +27,12 @@ public static void Main(string[] args)
             });
 
             // Add services to the container.
-            builder.Services.AddSwaggerGen(c =>
-            {
-                c.SwaggerDoc("v1", new OpenApiInfo { Title = "DevBlog", Version = "v1" });
-            });
+            // builder.Services.AddSwaggerGen(c =>
+            // {
+            //     c.SwaggerDoc("v1", new OpenApiInfo { Title = "DevBlog", Version = "v1" });
+            // });
 
-            builder.Services.AddControllersWithViews();
+            // builder.Services.AddControllersWithViews();
 
             // ----------------------- DATABASES -------------------------------
             builder.Services.AddDbContext<AppDbContext>(options =>
@@ -99,11 +99,11 @@ public static void Main(string[] args)
                 options.AddPolicy("Visitor", policy => policy.RequireRole(Role.Visitor));
             });
 
-            builder.Services.AddHttpsRedirection(options =>
-            {
-                options.RedirectStatusCode = (int)HttpStatusCode.TemporaryRedirect;
-                options.HttpsPort = 32778;
-            });
+            // builder.Services.AddHttpsRedirection(options =>
+            // {
+            //     options.RedirectStatusCode = (int)HttpStatusCode.TemporaryRedirect;
+            //     options.HttpsPort = 32778;
+            // });
 
             var app = builder.Build();
 
@@ -112,6 +112,8 @@ public static void Main(string[] args)
             if (!app.Environment.IsDevelopment())
             {
                 // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+                app.UseSwagger();
+                app.UseSwaggerUI();
                 app.UseHsts();
             }
 
@@ -120,16 +122,16 @@ public static void Main(string[] args)
 
             // ----------------------- ROUTING -------------------------------
             app.UseHttpsRedirection();
-            app.UseStaticFiles();
+            // app.UseStaticFiles();
             app.UseRouting();
             app.UseAuthentication();
             app.UseAuthorization();
 
-            app.UseSwagger();
-            app.UseSwaggerUI(c =>
-            {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "DevBlog");
-            });
+            // app.UseSwagger();
+            // app.UseSwaggerUI(c =>
+            // {
+            //     c.SwaggerEndpoint("/swagger/v1/swagger.json", "DevBlog");
+            // });
             app.UseDeveloperExceptionPage();
 
             app.MapControllerRoute(

server/devblog.csproj

@@ -2,22 +2,22 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
-		<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-		<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
+		<!-- <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked> -->
+		<!-- <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion> -->
 		<!-- <IsPackable>false</IsPackable> -->
 		<!-- <DefaultItemExcludes>$(DefaultItemExcludes);$(SpaRoot)node_modules\**</DefaultItemExcludes> -->
-		<SpaRoot>..\client</SpaRoot>
-		<SpaProxyServerUrl>https://localhost:44482</SpaProxyServerUrl>
+		<!-- <SpaRoot>..\client</SpaRoot> -->
+		<!-- <SpaProxyServerUrl>https://localhost:44482</SpaProxyServerUrl> -->
 		<ImplicitUsings>enable</ImplicitUsings>
 		<UserSecretsId>9c535b88-0982-4726-b8dd-98fd6ca72fbe</UserSecretsId>
 	    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<!-- <ItemGroup> -->
 		<!-- Don't publish the SPA source files, but do show them in the project files list -->
-		<Content Remove="$(SpaRoot)**" />
-		<None Remove="$(SpaRoot)**" />
-	</ItemGroup>
+		<!-- <Content Remove="$(SpaRoot)**" /> -->
+		<!-- <None Remove="$(SpaRoot)**" /> -->
+	<!-- </ItemGroup> -->
 
 	<ItemGroup>
 		<PackageReference Include="Discord.Net.Core" Version="3.10.0" />