diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fb60f14..ebca3ea 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -33,9 +33,8 @@ jobs: - name: Build and push CleanAspire.Standalone image run: | - docker build -t ${{ secrets.DOCKER_USERNAME }}/cleanaspire-standalone:${{ steps.version.outputs.version }} -f src/CleanAspire.ClientApp/Dockerfile . - docker push ${{ secrets.DOCKER_USERNAME }}/cleanaspire-standalone:${{ steps.version.outputs.version }} - + docker build -t ${{ secrets.DOCKER_USERNAME }}/cleanaspire-standalone:${{ steps.version.outputs.version }} -f src/CleanAspire.ClientApp/Dockerfile . + docker push ${{ secrets.DOCKER_USERNAME }}/cleanaspire-standalone:${{ steps.version.outputs.version }} - name: Build and push CleanAspire.WebApp image run: | docker build -t ${{ secrets.DOCKER_USERNAME }}/cleanaspire-webapp:${{ steps.version.outputs.version }} -f src/CleanAspire.WebApp/Dockerfile . diff --git a/README.md b/README.md index 13a5353..e4d009d 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,9 @@ https://github.com/neozhu/cleanaspire/issues/34 ### OpenAPI documentation - https://apiservice.blazorserver.com/scalar/v1 +### Blazor WebAssembly Standalone PWA +- https://standalone.blazorserver.com/ + ### Here is an example of a docker-compose.yml file for a local Docker deployment: @@ -89,7 +92,7 @@ https://github.com/neozhu/cleanaspire/issues/34 version: '3.8' services: apiservice: - image: blazordevlab/cleanaspire-api:0.0.62 + image: blazordevlab/cleanaspire-api:0.0.64 environment: - ASPNETCORE_ENVIRONMENT=Development - AllowedHosts=* @@ -111,7 +114,7 @@ services: - "8018:443" blazorweb: - image: blazordevlab/cleanaspire-webapp:0.0.62 + image: blazordevlab/cleanaspire-webapp:0.0.64 environment: - ASPNETCORE_ENVIRONMENT=Production - AllowedHosts=* @@ -123,7 +126,7 @@ services: - "8014:443" standalone: - image: blazordevlab/cleanaspire-standalone:0.0.62 + image: blazordevlab/cleanaspire-standalone:0.0.64 ports: - "8020:80" - "8021:443" diff --git a/src/CleanAspire.Api/Dockerfile b/src/CleanAspire.Api/Dockerfile index 11a92c8..d0adc9d 100644 --- a/src/CleanAspire.Api/Dockerfile +++ b/src/CleanAspire.Api/Dockerfile @@ -15,7 +15,7 @@ RUN dotnet restore "src/CleanAspire.Api/CleanAspire.Api.csproj" COPY . . WORKDIR /src/src/CleanAspire.Api -RUN dotnet publish -c Release -o /app/publish +RUN dotnet publish "./CleanAspire.Api.csproj" -c Release -o /app/publish # Stage 2: Create the runtime image FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime diff --git a/src/CleanAspire.ClientApp/Dockerfile b/src/CleanAspire.ClientApp/Dockerfile index 5500042..43e4bd2 100644 --- a/src/CleanAspire.ClientApp/Dockerfile +++ b/src/CleanAspire.ClientApp/Dockerfile @@ -15,7 +15,7 @@ RUN dotnet workload update # Copy the entire source code and build the application in Release mode COPY . . -RUN dotnet publish -c Release -o /app/publish -p:DefineConstants=STANDALONE +RUN dotnet publish "src/CleanAspire.ClientApp/CleanAspire.ClientApp.csproj" -c Release -o /app/publish -p:DefineConstants=STANDALONE # Stage 2: Serve the Blazor Client Application using Nginx FROM nginx:alpine AS final diff --git a/src/CleanAspire.ClientApp/wwwroot/appsettings.json b/src/CleanAspire.ClientApp/wwwroot/appsettings.json index e83e9a6..c3f998d 100644 --- a/src/CleanAspire.ClientApp/wwwroot/appsettings.json +++ b/src/CleanAspire.ClientApp/wwwroot/appsettings.json @@ -7,7 +7,7 @@ }, "ClientAppSettings": { "AppName": "Blazor Aspire", - "Version": "v0.0.62", + "Version": "v0.0.64", "ServiceBaseUrl": "https://apiservice.blazorserver.com" } } diff --git a/src/CleanAspire.WebApp/appsettings.json b/src/CleanAspire.WebApp/appsettings.json index 05f0e46..e6e9c4c 100644 --- a/src/CleanAspire.WebApp/appsettings.json +++ b/src/CleanAspire.WebApp/appsettings.json @@ -8,7 +8,7 @@ "AllowedHosts": "*", "ClientAppSettings": { "AppName": "Blazor Aspire", - "Version": "v0.0.62", + "Version": "v0.0.64", "ServiceBaseUrl": "https://apiservice.blazorserver.com" } }