From 68f13744a4554afc98bb19c83e43fd32bf0dd45b Mon Sep 17 00:00:00 2001 From: Lance McCarthy Date: Thu, 23 May 2024 12:46:48 -0400 Subject: [PATCH 1/4] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 16cc6d8..3932059 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,12 @@ A set of projects that test various Telerik and Kendo components in .NET Aspire! ## CI-CD Status -| Branch | Status | -|----------|--------| -| `main` | [![xx](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/build.yml/badge.svg)](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/build.yml) | -| `release` | [![xx](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/deploy.yml/badge.svg?branch=release)](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/deploy.yml) | -| `main` | [![xx](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/monitor-images.yml/badge.svg)](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/monitor-images.yml) | -| `main` | [![xx](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/update-images.yml/badge.svg)](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/update-images.yml) | +| Workflows | +|--------| +| [![build](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/build.yml/badge.svg)](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/build.yml) | +| [![deploy](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/deploy.yml/badge.svg?branch=release)](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/deploy.yml) | +| [![Monitor .NET Base Images](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/monitor-base-images.yml/badge.svg?branch=main)](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/monitor-base-images.yml) | +| [![Update Custom Base Images](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/update-base-images.yml/badge.svg?branch=main)](https://github.com/LanceMcCarthy/DevCraftAspire/actions/workflows/update-base-images.yml) | ## Azure Deployment Links From f34940f2c4d3e4522dff375e49f213dbcadd0890 Mon Sep 17 00:00:00 2001 From: Lance McCarthy Date: Thu, 23 May 2024 16:04:20 -0400 Subject: [PATCH 2/4] Update update-base-image.yml --- .github/workflows/update-base-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-base-image.yml b/.github/workflows/update-base-image.yml index e5ee599..573380a 100644 --- a/.github/workflows/update-base-image.yml +++ b/.github/workflows/update-base-image.yml @@ -30,5 +30,5 @@ jobs: id: build-and-publish run: | eight_tagged="${{env.REGISTRY_NAME}}/${{env.REPOSITORY}}:8.0" - docker build -t $eight_tagged -t $latest_tagged -f Dockerfile . + docker build -t $eight_tagged -f Dockerfile . docker push $eight_tagged \ No newline at end of file From 946f09ee80eb2316d79827bc22b3365736074c29 Mon Sep 17 00:00:00 2001 From: Lance McCarthy Date: Thu, 23 May 2024 16:20:20 -0400 Subject: [PATCH 3/4] Update update-base-image.yml --- .github/workflows/update-base-image.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update-base-image.yml b/.github/workflows/update-base-image.yml index 573380a..2ae5eef 100644 --- a/.github/workflows/update-base-image.yml +++ b/.github/workflows/update-base-image.yml @@ -3,7 +3,6 @@ on: workflow_dispatch: env: - REGISTRY_NAME: "acrjmotg62yke5uc" REGISTRY_URL: "acrjmotg62yke5uc.azurecr.io" REGISTRY_USERNAME: "acrjmotg62yke5uc" REPOSITORY: "lancemccarthy/aspirebase" @@ -29,6 +28,5 @@ jobs: working-directory: '.dockerbuilds/baseimage' id: build-and-publish run: | - eight_tagged="${{env.REGISTRY_NAME}}/${{env.REPOSITORY}}:8.0" - docker build -t $eight_tagged -f Dockerfile . - docker push $eight_tagged \ No newline at end of file + docker build -t "${{env.REGISTRY_URL}}/${{env.REPOSITORY}}:8.0" -f Dockerfile . + docker push "${{env.REGISTRY_URL}}/${{env.REPOSITORY}}:8.0" \ No newline at end of file From 728eac4a531cb4a5eedce9cba57efcaf1917ec63 Mon Sep 17 00:00:00 2001 From: Lance McCarthy Date: Thu, 23 May 2024 16:25:51 -0400 Subject: [PATCH 4/4] Update DevCraftAspire.ApiService.csproj --- DevCraftAspire.ApiService/DevCraftAspire.ApiService.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DevCraftAspire.ApiService/DevCraftAspire.ApiService.csproj b/DevCraftAspire.ApiService/DevCraftAspire.ApiService.csproj index 847bcf6..5528f88 100644 --- a/DevCraftAspire.ApiService/DevCraftAspire.ApiService.csproj +++ b/DevCraftAspire.ApiService/DevCraftAspire.ApiService.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - ghcr.io/lancemccarthy/aspirebase:8.0 + acrjmotg62yke5uc.azurecr.io/lancemccarthy/aspirebase:8.0