diff --git a/examples/FhirLabsApi/Dockerfile b/examples/FhirLabsApi/Dockerfile index 0376a3ca..4d0c825f 100644 --- a/examples/FhirLabsApi/Dockerfile +++ b/examples/FhirLabsApi/Dockerfile @@ -1,13 +1,13 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 COPY SureFhirLabs_CA.cer /etc/ssl/certs RUN update-ca-certificates -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["nuget.config", "."] diff --git a/examples/FhirLabsApi/Dockerfile.gcp b/examples/FhirLabsApi/Dockerfile.gcp deleted file mode 100644 index 93cc0371..00000000 --- a/examples/FhirLabsApi/Dockerfile.gcp +++ /dev/null @@ -1,59 +0,0 @@ -#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:8.0 AS base -WORKDIR /app -EXPOSE 8080 -EXPOSE 443 -COPY SureFhirLabs_CA.cer /etc/ssl/certs -RUN update-ca-certificates - -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build - - -WORKDIR /src - -COPY ["nuget.config", "."] -COPY ["FhirLabsApi.csproj", "."] -RUN dotnet restore "FhirLabsApi.csproj" -COPY . . - -ENV GCPDeploy=true -RUN dotnet build "FhirLabsApi.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "FhirLabsApi.csproj" -c Release -o /app/publish /p:UseAppHost=false - - -FROM base AS final -WORKDIR /app - - -# Install system dependencies -ENV GCSFUSE_VERSION=1.2.0 - -RUN set -e; \ - apt-get update -y && apt-get install -y gnupg2 tini fuse lsb-release curl; \ - curl -LJO "https://github.com/GoogleCloudPlatform/gcsfuse/releases/download/v${GCSFUSE_VERSION}/gcsfuse_${GCSFUSE_VERSION}_amd64.deb"; \ - apt-get install -y gcsfuse && apt-get clean; \ - dpkg -i "gcsfuse_${GCSFUSE_VERSION}_amd64.deb" - -ENV MNT_DIR=/mnt/gcs - - -COPY --from=publish /app/publish . -ENV ASPNETCORE_URLS=http://*:8080 - - -# Copy the statup script -COPY gcsfuse_run.sh ./gcsfuse_run.sh -RUN chmod +x ./gcsfuse_run.sh - -# Use tini to manage zombie processes and signal forwarding -# https://github.com/krallin/tini -ENTRYPOINT ["/usr/bin/tini", "--"] - -#ENTRYPOINT ["dotnet", "FhirLabsApi.dll"] - -# Run the web service on container startup. -# Remember the dotnet technique ends is in the app path -CMD ["/app/gcsfuse_run.sh"] diff --git a/examples/FhirLabsApi/cloudbuild.yaml b/examples/FhirLabsApi/cloudbuild.yaml deleted file mode 100644 index 7f0a8754..00000000 --- a/examples/FhirLabsApi/cloudbuild.yaml +++ /dev/null @@ -1,29 +0,0 @@ -steps: -# Build the container image -- name: 'gcr.io/cloud-builders/docker' - args: [ 'build', '-t', 'us-west1-docker.pkg.dev/$PROJECT_ID/cloud-run-source-deploy/fhirlabs.api:$TAG_NAME', '--file', './Dockerfile.gcp', '.' ] - -# See:: https://cloud.google.com/build/docs/deploying-builds/deploy-cloud-run -# Push the container image to Container Registry -- name: 'gcr.io/cloud-builders/docker' - args: ['push', 'us-west1-docker.pkg.dev/$PROJECT_ID/cloud-run-source-deploy/fhirlabs.api:$TAG_NAME'] - -# Deploy container image to Cloud Run -- name: 'gcr.io/google.com/cloudsdktool/cloud-sdk' - entrypoint: gcloud - args: [ - 'run', 'deploy', 'fhirlabs-api', - '--region', 'us-west1', - '--image', 'us-west1-docker.pkg.dev/$PROJECT_ID/cloud-run-source-deploy/fhirlabs.api:$TAG_NAME', - '--max-instances', '1', - '--min-instances', '1', - '--concurrency', '8', - '--set-env-vars', 'GCLOUD_PROJECT=true,BUCKET=fhirlabs-r4-bucket', - '--execution-environment', 'gen2', - '--cpu', '2000m', - '--memory', '2048Mi', - '--set-secrets', '/secret/fhirlabs_appsettings=fhirlabs_appsettings:latest' - ] - -images: -- 'us-west1-docker.pkg.dev/$PROJECT_ID/cloud-run-source-deploy/fhirlabs.api:$TAG_NAME' \ No newline at end of file diff --git a/examples/Tefca.Proxy.Server/Dockerfile b/examples/Tefca.Proxy.Server/Dockerfile index 2eb186dd..0414c2b4 100644 --- a/examples/Tefca.Proxy.Server/Dockerfile +++ b/examples/Tefca.Proxy.Server/Dockerfile @@ -1,12 +1,12 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER app WORKDIR /app EXPOSE 8080 EXPOSE 8081 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src diff --git a/examples/Tefca.Proxy.Server/Dockerfile.gcp b/examples/Tefca.Proxy.Server/Dockerfile.gcp index 78d6c919..c5eef20d 100644 --- a/examples/Tefca.Proxy.Server/Dockerfile.gcp +++ b/examples/Tefca.Proxy.Server/Dockerfile.gcp @@ -1,12 +1,12 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER app WORKDIR /app EXPOSE 8080 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src diff --git a/examples/Udap.Auth.Server.Admin/Dockerfile b/examples/Udap.Auth.Server.Admin/Dockerfile index 419e5d41..69c2eb68 100644 --- a/examples/Udap.Auth.Server.Admin/Dockerfile +++ b/examples/Udap.Auth.Server.Admin/Dockerfile @@ -1,11 +1,11 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["nuget.config", "."] diff --git a/examples/Udap.Auth.Server/Dockerfile b/examples/Udap.Auth.Server/Dockerfile index 09083517..112b3056 100644 --- a/examples/Udap.Auth.Server/Dockerfile +++ b/examples/Udap.Auth.Server/Dockerfile @@ -1,6 +1,6 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 @@ -9,7 +9,7 @@ COPY SureFhirLabs_CA.cer /etc/ssl/certs COPY ngnix-proxy-TestCA.cer /etc/ssl/certs RUN update-ca-certificates -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["nuget.config", "."] diff --git a/examples/Udap.Auth.Server/Dockerfile.gcp b/examples/Udap.Auth.Server/Dockerfile.gcp index 349f18f4..46231057 100644 --- a/examples/Udap.Auth.Server/Dockerfile.gcp +++ b/examples/Udap.Auth.Server/Dockerfile.gcp @@ -1,6 +1,6 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 @@ -10,7 +10,7 @@ RUN update-ca-certificates -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["nuget.config", "."] diff --git a/examples/Udap.CA/Dockerfile b/examples/Udap.CA/Dockerfile index e3f41d58..05b6e9c5 100644 --- a/examples/Udap.CA/Dockerfile +++ b/examples/Udap.CA/Dockerfile @@ -1,11 +1,11 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src ENV GCPDeploy=true diff --git a/examples/Udap.Identity.Provider.2/Dockerfile b/examples/Udap.Identity.Provider.2/Dockerfile index a256e1fb..34e9a2d3 100644 --- a/examples/Udap.Identity.Provider.2/Dockerfile +++ b/examples/Udap.Identity.Provider.2/Dockerfile @@ -1,11 +1,11 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["nuget.config", "."] diff --git a/examples/Udap.Identity.Provider.2/Dockerfile.gcp b/examples/Udap.Identity.Provider.2/Dockerfile.gcp index 225fe315..5fb58df2 100644 --- a/examples/Udap.Identity.Provider.2/Dockerfile.gcp +++ b/examples/Udap.Identity.Provider.2/Dockerfile.gcp @@ -1,11 +1,11 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["nuget.config", "."] diff --git a/examples/Udap.Identity.Provider/Dockerfile b/examples/Udap.Identity.Provider/Dockerfile index 336c7198..bcc08976 100644 --- a/examples/Udap.Identity.Provider/Dockerfile +++ b/examples/Udap.Identity.Provider/Dockerfile @@ -1,11 +1,11 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 80 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["nuget.config", "."] diff --git a/examples/Udap.Identity.Provider/Dockerfile.gcp b/examples/Udap.Identity.Provider/Dockerfile.gcp index a5601db4..4cbf1827 100644 --- a/examples/Udap.Identity.Provider/Dockerfile.gcp +++ b/examples/Udap.Identity.Provider/Dockerfile.gcp @@ -1,11 +1,11 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 8080 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["nuget.config", "."] diff --git a/examples/Udap.Proxy.Server/Dockerfile b/examples/Udap.Proxy.Server/Dockerfile index 1dd8a9b5..c1066519 100644 --- a/examples/Udap.Proxy.Server/Dockerfile +++ b/examples/Udap.Proxy.Server/Dockerfile @@ -1,12 +1,12 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER app WORKDIR /app EXPOSE 8080 EXPOSE 8081 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src diff --git a/examples/Udap.Proxy.Server/Dockerfile.gcp b/examples/Udap.Proxy.Server/Dockerfile.gcp index 278f10c2..46528ed7 100644 --- a/examples/Udap.Proxy.Server/Dockerfile.gcp +++ b/examples/Udap.Proxy.Server/Dockerfile.gcp @@ -1,12 +1,12 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER app WORKDIR /app EXPOSE 8080 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src diff --git a/examples/Udap.Proxy.Server/Udap.Proxy.Server.csproj b/examples/Udap.Proxy.Server/Udap.Proxy.Server.csproj index 539c01fe..910dc3c7 100644 --- a/examples/Udap.Proxy.Server/Udap.Proxy.Server.csproj +++ b/examples/Udap.Proxy.Server/Udap.Proxy.Server.csproj @@ -25,19 +25,19 @@ - + - + diff --git a/examples/mTLS.Proxy.Server/Dockerfile b/examples/mTLS.Proxy.Server/Dockerfile index a6a84a52..8a18e847 100644 --- a/examples/mTLS.Proxy.Server/Dockerfile +++ b/examples/mTLS.Proxy.Server/Dockerfile @@ -1,12 +1,12 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER app WORKDIR /app EXPOSE 8080 EXPOSE 8081 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["mTLS.Proxy.Server.csproj", "."] diff --git a/examples/mTLS.Proxy.Server/Dockerfile.gcp b/examples/mTLS.Proxy.Server/Dockerfile.gcp index baa661f6..65c8828b 100644 --- a/examples/mTLS.Proxy.Server/Dockerfile.gcp +++ b/examples/mTLS.Proxy.Server/Dockerfile.gcp @@ -1,12 +1,12 @@ #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base USER app WORKDIR /app EXPOSE 8080 EXPOSE 443 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src diff --git a/migrations/UdapDb.Postgres/Dockerfile b/migrations/UdapDb.Postgres/Dockerfile index d066619e..e2c5c54e 100644 --- a/migrations/UdapDb.Postgres/Dockerfile +++ b/migrations/UdapDb.Postgres/Dockerfile @@ -1,10 +1,10 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["nuget.config", "."] COPY . . diff --git a/migrations/UdapDb.SqlServer/Dockerfile b/migrations/UdapDb.SqlServer/Dockerfile index d066619e..e2c5c54e 100644 --- a/migrations/UdapDb.SqlServer/Dockerfile +++ b/migrations/UdapDb.SqlServer/Dockerfile @@ -1,10 +1,10 @@ #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:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["nuget.config", "."] COPY . .