chore: update generated content

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

.github/workflows/ci.yml

@@ -375,7 +375,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-          scope: push
+          scope: '@push'
       -
         name: Print config.json files
         shell: bash
@@ -405,7 +405,7 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-          scope: docker/buildx-bin@push
+          scope: 'docker/buildx-bin@push'
       -
         name: Print config.json files
         shell: bash
@@ -436,7 +436,7 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-          scope: push
+          scope: '@push'
       -
         name: Print config.json files
         shell: bash
@@ -467,7 +467,7 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-          scope: docker/login-action@push
+          scope: 'docker/login-action@push'
       -
         name: Print config.json files
         shell: bash

src/docker.ts

@@ -55,8 +55,14 @@ export async function loginECR(registry: string, username: string, password: str
 async function loginExec(registry: string, username: string, password: string, scope?: string): Promise<void> {
   let envs: {[key: string]: string} | undefined;
   if (scope && scope.length > 0) {
+    let dockerConfigDir = path.join(Buildx.configDir, 'config', registry === 'docker.io' ? 'registry-1.docker.io' : registry);
+    if (scope.startsWith('@')) {
+      dockerConfigDir += scope;
+    } else {
+      dockerConfigDir = path.join(dockerConfigDir, scope);
+    }
     envs = Object.assign({}, process.env, {
-      DOCKER_CONFIG: path.join(Buildx.configDir, 'config', registry, scope)
+      DOCKER_CONFIG: dockerConfigDir
     }) as {
       [key: string]: string;
     };