Fix docker variables (#115)

Signed-off-by: Shubham Sharma <shubhash@microsoft.com>
Azure · May 18, 2023 · 55f4847 · 55f4847
1 parent 9863459
commit 55f4847
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      APP_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
+      APP_REGISTRY: ${{ secrets.DOCKER_REGISTRY_URL }}/${{ secrets.DOCKER_REGISTRY_PATH }}
       CONFIGURATION: Release
       DEV_VERSION_SUFFIX: 99.99.99
       DOTNET_SAMPLE_APP_IMAGE_NAME: dotnet-azurefunction
@@ -55,7 +55,7 @@ jobs:
         if: github.event_name != 'pull_request'
         run: |
           echo performing docker login
-          docker login -u ${{ secrets.DOCKER_REGISTRY_ID }} -p ${{ secrets.DOCKER_REGISTRY_PASS }}
+          docker login ${{ secrets.DOCKER_REGISTRY_URL }} -u ${{ secrets.DOCKER_REGISTRY_ID }} -p ${{ secrets.DOCKER_REGISTRY_PASS }}
           echo pushing docker image for ${{ env.DOTNET_SAMPLE_APP_IMAGE_NAME }}
           echo image with tag ${{ env.APP_REGISTRY }}/${{ env.DOTNET_SAMPLE_APP_IMAGE_NAME }}:${{ env.REL_VERSION }} will be pushed
           docker push ${{ env.APP_REGISTRY }}/${{ env.DOTNET_SAMPLE_APP_IMAGE_NAME }}:${{ env.REL_VERSION }}

diff --git a/docs/development/setup-ci.md b/docs/development/setup-ci.md
@@ -16,9 +16,10 @@ A GitHub account.
 
 | Name | Description |
 |--|--|
-| DOCKER_REGISTRY_ID | Username for Docker registry, required for uploading sample image|
-| DOCKER_REGISTRY_PASS | Password for Docker registry, required for uploading sample image|
-| DOCKER_REGISTRY | URL to Docker registry, required for uploading sample image |
+| DOCKER_REGISTRY_URL | URL of Docker registry, required for logging in to Docker registry, e.g. `myregistry.azurecr.io` |
+| DOCKER_REGISTRY_PATH | Path to store Docker images, required for uploading sample image, e.g. `samples/dotnet` |
+| DOCKER_REGISTRY_ID | Username for Docker registry, required for uploading sample image |
+| DOCKER_REGISTRY_PASS | Password for Docker registry, required for uploading sample image |
 | AZCOPY_SPA_APPLICATION_ID | Service principal application ID for AzCopy, required for uploading NuGet packages |
 | AZCOPY_SPA_CLIENT_SECRET | Service principal client secret for AzCopy, required for uploading NuGet packages |
 | GITHUB_TOKEN | GitHub token, required for creating release |