Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update CD config as new buildpack version fixed bugs #845

Merged
merged 1 commit into from
Sep 9, 2022
Merged

update CD config as new buildpack version fixed bugs #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions cloudbuild-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,9 @@ steps:
args:
- build
- gcr.io/$PROJECT_ID/oos-api:$SHORT_SHA
# TODO: some weird behaviour with old .Net buildpack & layer caches. Comment for now
# - --cache-image=gcr.io/$PROJECT_ID/oos-api:cache
# There is a bug in later versions of .Net 6 SDK 6.0.200 or higher (or rather Nuget toolset) [https://github.com/dotnet/sdk/issues/23461].
# It works fine if you are using MSBuild, but sometimes it fails to restore packages if you are using dotnet CLI.
# There are 2 workarounds - either use older build tools version does not have this bug yet or compile the code
# outside of container build tools (which still means the bug could manifest on Linux).
# - --builder=paketobuildpacks/builder:base
- --builder=paketobuildpacks/builder:0.2.0-base
# - --buildpack=gcr.io/paketo-buildpacks/dotnet-core
- --buildpack=docker:///gcr.io/paketo-buildpacks/dotnet-core:0.11.3
- --cache-image=gcr.io/$PROJECT_ID/oos-api:cache
- --builder=paketobuildpacks/builder:base
- --buildpack=gcr.io/paketo-buildpacks/dotnet-core
- --env=BP_DOTNET_PROJECT_PATH=./OutOfSchool/OutOfSchool.WebApi/
- --publish
# Deploy container image to Cloud Run
Expand All @@ -37,7 +30,7 @@ steps:
- $_SERVICE_ACCOUNT
- --cpu=2
- --memory=1Gi
- --max-instances=3
- --max-instances=5
- --concurrency=200
- --timeout=120
- --set-env-vars=ASPNETCORE_ENVIRONMENT=$_ASPNETCORE_ENVIRONMENT
Expand Down
17 changes: 5 additions & 12 deletions cloudbuild-auth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,9 @@ steps:
args:
- build
- gcr.io/$PROJECT_ID/oos-auth:$SHORT_SHA
# TODO: some weird behaviour with old .Net buildpack & layer caches. Comment for now
# - --cache-image=gcr.io/$PROJECT_ID/oos-auth:cache
# There is a bug in later versions of .Net 6 SDK 6.0.200 or higher (or rather Nuget toolset) [https://github.com/dotnet/sdk/issues/23461].
# It works fine if you are using MSBuild, but sometimes it fails to restore packages if you are using dotnet CLI.
# There are 2 workarounds - either use older build tools version does not have this bug yet or compile the code
# outside of container build tools (which still means the bug could manifest on Linux).
# - --buildpack=gcr.io/paketo-buildpacks/dotnet-core
- --buildpack=docker:///gcr.io/paketo-buildpacks/dotnet-core:0.11.3
# - --builder=paketobuildpacks/builder:base
- --builder=paketobuildpacks/builder:0.2.0-base
- --cache-image=gcr.io/$PROJECT_ID/oos-auth:cache
- --buildpack=gcr.io/paketo-buildpacks/dotnet-core
- --builder=paketobuildpacks/builder:base
- --env=BP_DOTNET_PROJECT_PATH=./OutOfSchool/OutOfSchool.IdentityServer/
- --publish
# Deploy container image to Cloud Run
Expand All @@ -37,8 +30,8 @@ steps:
- $_SERVICE_ACCOUNT
- --cpu=2
- --memory=512Mi
- --max-instances=2
- --concurrency=80
- --max-instances=3
- --concurrency=120
- --set-env-vars=ASPNETCORE_ENVIRONMENT=$_ASPNETCORE_ENVIRONMENT
- --set-env-vars=Email__AddressFrom=$_SENDER_EMAIL
- --set-env-vars=ConnectionStringsOverride__DefaultConnection__UserId=oos
Expand Down