Revert ContainerBaseImage Testing - Push To Production

.github/workflows/deploy.yml

@@ -11,7 +11,7 @@ on:
       - 'DevCraftAspire.Web/**/*'
 
 jobs:
-  # Build a custom base image with needed Linux dependencies installed (being done on a weekly schedule now)
+  # Build a custom base image with needed Linux dependencies preinstalled
   update_base_image:
     runs-on: ubuntu-latest
     permissions:
@@ -49,7 +49,7 @@ jobs:
   # - The ApiService project needs the custom base image, defined as ContainerBaseImage in the csproj
   # - The rest can use the default mcr.microsoft.com/dotnet/aspnet:8.0 image
   deploy_app:
-    needs: [update_base_image]
+    # needs: [update_base_image]
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -66,6 +66,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
+    - name: Install .NET Aspire workload
+      run: dotnet nuget list source
+
     # For azd deploy to pull base image defined in ApiService.csproj
     - name: Login to ghcr.io
       uses: azure/docker-login@v1
@@ -75,16 +78,22 @@ jobs:
         password: ${{secrets.GITHUB_TOKEN}}
 
     - name: Update NuGet Package Sources
-      run: dotnet nuget update source "TelerikServer" -s "https://nuget.telerik.com/v3/index.json" -u 'api-key' -p ${{secrets.TELERIK_NUGET_KEY}} --configfile ${{env.NUGET_CONF_PATH}} --store-password-in-clear-text
+      run: dotnet nuget update source "TelerikServer" -s "https://nuget.telerik.com/v3/index.json" -u 'api-key' -p ${{secrets.TELERIK_NUGET_KEY}} --store-password-in-clear-text
 
     - name: Install .NET Aspire workload
-      run: dotnet workload install aspire
-
+      run: dotnet workload install aspire --ignore-failed-sources
+
+    # - name: BaseContainerImage Isolated Test
+    #   run: |
+    #     dotnet restore
+    #     dotnet build -c Release --no-restore
+    #     dotnet publish 'DevCraftAspire.ApiService/DevCraftAspire.ApiService.csproj' /t:PublishContainer --no-build --no-restore
+
     - name: Install azd
       uses: Azure/[email protected]
 
     - name: Log into Azure with GitHub Federated Credentials (OpenID)
-      run: azd auth login --client-id "$Env:AZURE_CLIENT_ID" --tenant-id "$Env:AZURE_TENANT_ID" --federated-credential-provider "github"
+      run: azd auth login --client-id "${{env.AZURE_CLIENT_ID}}" --tenant-id "${{env.AZURE_TENANT_ID}}" --federated-credential-provider "github"
       shell: pwsh
 
     - name: Provision Infrastructure

DevCraftAspire.ApiService/DevCraftAspire.ApiService.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
   <PropertyGroup>
-    <ContainerBaseImage>ghcr.io/lancemccarthy/aspirebase:8.0</ContainerBaseImage>
+    <!--<ContainerBaseImage>ghcr.io/lancemccarthy/aspirebase:8.0</ContainerBaseImage>-->
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -27,5 +26,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-
 </Project>