build(deps): bump the aws-sdk-dependencies group with 2 updates

Bumps the aws-sdk-dependencies group with 2 updates: [@aws-sdk/client-ecr](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-ecr) and [@aws-sdk/client-ecr-public](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-ecr-public).


Updates `@aws-sdk/client-ecr` from 3.890.0 to 3.899.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-ecr/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.899.0/clients/client-ecr)

Updates `@aws-sdk/client-ecr-public` from 3.890.0 to 3.899.0
- [Release notes](https://github.com/aws/aws-sdk-js-v3/releases)
- [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-ecr-public/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.899.0/clients/client-ecr-public)

---
updated-dependencies:
- dependency-name: "@aws-sdk/client-ecr"
  dependency-version: 3.899.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: aws-sdk-dependencies
- dependency-name: "@aws-sdk/client-ecr-public"
  dependency-version: 3.899.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: aws-sdk-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Stop docker
         run: |
@@ -43,7 +43,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to GitHub Container Registry
         uses: ./
@@ -60,7 +60,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to GitHub Container Registry
         uses: ./
@@ -85,7 +85,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to ACR
         uses: ./
@@ -105,7 +105,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to Docker Hub
         uses: ./
@@ -124,7 +124,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to ECR
         uses: ./
@@ -144,7 +144,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v5
@@ -169,7 +169,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to Public ECR
         continue-on-error: ${{ matrix.os == 'windows-latest' }}
@@ -192,7 +192,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v5
@@ -207,7 +207,7 @@ jobs:
         with:
           registry: public.ecr.aws
 
-  ghcr:
+  github-container:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -218,7 +218,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to GitHub Container Registry
         uses: ./
@@ -238,7 +238,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to GitLab
         uses: ./
@@ -258,7 +258,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to Google Artifact Registry
         uses: ./
@@ -278,7 +278,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to Google Container Registry
         uses: ./
@@ -292,7 +292,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to registries
         uses: ./
@@ -315,7 +315,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to registries
         uses: ./
@@ -336,7 +336,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Login to registries
         id: login
@@ -356,125 +356,3 @@ jobs:
             echo "::error::Should have failed"
             exit 1
           fi
-
-  scope-dockerhub:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v6
-      -
-        name: Login to Docker Hub
-        uses: ./
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-          scope: '@push'
-      -
-        name: Print config.json files
-        shell: bash
-        run: |
-          shopt -s globstar nullglob
-          for file in ~/.docker/**/config.json; do
-            echo "## ${file}"
-            jq '(.auths[]?.auth) |= "REDACTED"' "$file"
-            echo ""
-          done
-
-  scope-dockerhub-repo:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v6
-      -
-        name: Login to Docker Hub
-        uses: ./
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-          scope: 'docker/buildx-bin@push'
-      -
-        name: Print config.json files
-        shell: bash
-        run: |
-          shopt -s globstar nullglob
-          for file in ~/.docker/**/config.json; do
-            echo "## ${file}"
-            jq '(.auths[]?.auth) |= "REDACTED"' "$file"
-            echo ""
-          done
-
-  scope-ghcr:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v6
-      -
-        name: Login to GitHub Container Registry
-        uses: ./
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          scope: '@push'
-      -
-        name: Print config.json files
-        shell: bash
-        run: |
-          shopt -s globstar nullglob
-          for file in ~/.docker/**/config.json; do
-            echo "## ${file}"
-            jq '(.auths[]?.auth) |= "REDACTED"' "$file"
-            echo ""
-          done
-
-  scope-ghcr-repo:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v6
-      -
-        name: Login to GitHub Container Registry
-        uses: ./
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          scope: 'docker/login-action@push'
-      -
-        name: Print config.json files
-        shell: bash
-        run: |
-          shopt -s globstar nullglob
-          for file in ~/.docker/**/config.json; do
-            echo "## ${file}"
-            jq '(.auths[]?.auth) |= "REDACTED"' "$file"
-            echo ""
-          done

.github/workflows/codeql.yml

@@ -31,7 +31,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Initialize CodeQL
         uses: github/codeql-action/init@v4

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Publish
         uses: actions/publish-immutable-action@v0.0.4

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: Test
         uses: docker/bake-action@v6

.github/workflows/validate.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v5
       -
         name: List targets
         id: generate

README.md

@@ -568,13 +568,13 @@ The following inputs can be used as `step.with` keys:
 | `registry`      | String | `docker.io` | Server address of Docker registry. If not set then will default to Docker Hub |
 | `username`      | String |             | Username for authenticating to the Docker registry                            |
 | `password`      | String |             | Password or personal access token for authenticating the Docker registry      |
-| `scope`         | String |             | Scope for the authentication token                                            |
 | `ecr`           | String | `auto`      | Specifies whether the given registry is ECR (`auto`, `true` or `false`)       |
 | `logout`        | Bool   | `true`      | Log out from the Docker registry at the end of a job                          |
 | `registry-auth` | YAML   |             | Raw authentication to registries, defined as YAML objects                     |
 
 > [!NOTE]
-> The `registry-auth` input cannot be used with other inputs except `logout`.
+> The `registry-auth` input is mutually exclusive with `registry`, `username`,
+> `password` and `ecr` inputs.
 
 ## Contributing
 

__tests__/docker.test.ts

@@ -50,7 +50,7 @@ test('logout calls exec', async () => {
 
   const registry = 'https://ghcr.io';
 
-  await logout(registry, '');
+  await logout(registry);
 
   expect(execSpy).toHaveBeenCalledTimes(1);
   const callfunc = execSpy.mock.calls[0];

action.yml

@@ -19,9 +19,6 @@ inputs:
   ecr:
     description: 'Specifies whether the given registry is ECR (auto, true or false)'
     required: false
-  scope:
-    description: 'Scope for the authentication token'
-    required: false
   logout:
     description: 'Log out from the Docker registry at the end of a job'
     default: 'true'

package.json

@@ -26,8 +26,8 @@
   "packageManager": "yarn@4.9.2",
   "dependencies": {
     "@actions/core": "^1.11.1",
-    "@aws-sdk/client-ecr": "^3.890.0",
-    "@aws-sdk/client-ecr-public": "^3.890.0",
+    "@aws-sdk/client-ecr": "^3.913.0",
+    "@aws-sdk/client-ecr-public": "^3.913.0",
     "@docker/actions-toolkit": "^0.63.0",
     "http-proxy-agent": "^7.0.2",
     "https-proxy-agent": "^7.0.6",

src/context.ts

@@ -1,82 +1,21 @@
-import path from 'path';
 import * as core from '@actions/core';
-import * as yaml from 'js-yaml';
-
-import {Buildx} from '@docker/actions-toolkit/lib/buildx/buildx';
 
 export interface Inputs {
   registry: string;
   username: string;
   password: string;
-  scope: string;
   ecr: string;
   logout: boolean;
   registryAuth: string;
 }
 
-export interface Auth {
-  registry: string;
-  username: string;
-  password: string;
-  scope: string;
-  ecr: string;
-  configDir: string;
-}
-
 export function getInputs(): Inputs {
   return {
     registry: core.getInput('registry'),
     username: core.getInput('username'),
     password: core.getInput('password'),
-    scope: core.getInput('scope'),
     ecr: core.getInput('ecr'),
     logout: core.getBooleanInput('logout'),
     registryAuth: core.getInput('registry-auth')
   };
 }
-
-export function getAuthList(inputs: Inputs): Array<Auth> {
-  if (inputs.registryAuth && (inputs.registry || inputs.username || inputs.password || inputs.scope || inputs.ecr)) {
-    throw new Error('Cannot use registry-auth with other inputs');
-  }
-  let auths: Array<Auth> = [];
-  if (!inputs.registryAuth) {
-    auths.push({
-      registry: inputs.registry || 'docker.io',
-      username: inputs.username,
-      password: inputs.password,
-      scope: inputs.scope,
-      ecr: inputs.ecr || 'auto',
-      configDir: scopeToConfigDir(inputs.registry, inputs.scope)
-    });
-  } else {
-    auths = (yaml.load(inputs.registryAuth) as Array<Auth>).map(auth => {
-      core.setSecret(auth.password); // redacted in workflow logs
-      return {
-        registry: auth.registry || 'docker.io',
-        username: auth.username,
-        password: auth.password,
-        scope: auth.scope,
-        ecr: auth.ecr || 'auto',
-        configDir: scopeToConfigDir(auth.registry || 'docker.io', auth.scope)
-      };
-    });
-  }
-  if (auths.length == 0) {
-    throw new Error('No registry to login');
-  }
-  return auths;
-}
-
-export function scopeToConfigDir(registry: string, scope?: string): string {
-  if (!scope || scope === '') {
-    return '';
-  }
-  let configDir = path.join(Buildx.configDir, 'config', registry === 'docker.io' ? 'registry-1.docker.io' : registry);
-  if (scope.startsWith('@')) {
-    configDir += scope;
-  } else {
-    configDir = path.join(configDir, scope);
-  }
-  return configDir;
-}

src/docker.ts

@@ -1,31 +1,19 @@
-import * as core from '@actions/core';
-
 import * as aws from './aws';
-import * as context from './context';
+import * as core from '@actions/core';
 
 import {Docker} from '@docker/actions-toolkit/lib/docker/docker';
 
-export async function login(auth: context.Auth): Promise<void> {
-  if (/true/i.test(auth.ecr) || (auth.ecr == 'auto' && aws.isECR(auth.registry))) {
-    await loginECR(auth.registry, auth.username, auth.password, auth.scope);
+export async function login(registry: string, username: string, password: string, ecr: string): Promise<void> {
+  if (/true/i.test(ecr) || (ecr == 'auto' && aws.isECR(registry))) {
+    await loginECR(registry, username, password);
   } else {
-    await loginStandard(auth.registry, auth.username, auth.password, auth.scope);
+    await loginStandard(registry, username, password);
   }
 }
 
-export async function logout(registry: string, configDir: string): Promise<void> {
-  let envs: {[key: string]: string} | undefined;
-  if (configDir !== '') {
-    envs = Object.assign({}, process.env, {
-      DOCKER_CONFIG: configDir
-    }) as {
-      [key: string]: string;
-    };
-    core.info(`Alternative config dir: ${configDir}`);
-  }
+export async function logout(registry: string): Promise<void> {
   await Docker.getExecOutput(['logout', registry], {
-    ignoreReturnCode: true,
-    env: envs
+    ignoreReturnCode: true
   }).then(res => {
     if (res.stderr.length > 0 && res.exitCode != 0) {
       core.warning(res.stderr.trim());
@@ -33,7 +21,7 @@ export async function logout(registry: string, configDir: string): Promise<void>
   });
 }
 
-export async function loginStandard(registry: string, username: string, password: string, scope?: string): Promise<void> {
+export async function loginStandard(registry: string, username: string, password: string): Promise<void> {
   if (!username && !password) {
     throw new Error('Username and password required');
   }
@@ -43,38 +31,38 @@ export async function loginStandard(registry: string, username: string, password
   if (!password) {
     throw new Error('Password required');
   }
-  await loginExec(registry, username, password, scope);
-}
 
-export async function loginECR(registry: string, username: string, password: string, scope?: string): Promise<void> {
-  core.info(`Retrieving registries data through AWS SDK...`);
-  const regDatas = await aws.getRegistriesData(registry, username, password);
-  for (const regData of regDatas) {
-    await loginExec(regData.registry, regData.username, regData.password, scope);
-  }
-}
+  const loginArgs: Array<string> = ['login', '--password-stdin'];
+  loginArgs.push('--username', username);
+  loginArgs.push(registry);
 
-async function loginExec(registry: string, username: string, password: string, scope?: string): Promise<void> {
-  let envs: {[key: string]: string} | undefined;
-  if (scope && scope !== '') {
-    envs = Object.assign({}, process.env, {
-      DOCKER_CONFIG: context.scopeToConfigDir(registry, scope)
-    }) as {
-      [key: string]: string;
-    };
-    core.info(`Logging into ${registry} (scope ${scope})...`);
-  } else {
-    core.info(`Logging into ${registry}...`);
-  }
-  await Docker.getExecOutput(['login', '--password-stdin', '--username', username, registry], {
+  core.info(`Logging into ${registry}...`);
+  await Docker.getExecOutput(loginArgs, {
     ignoreReturnCode: true,
     silent: true,
-    input: Buffer.from(password),
-    env: envs
+    input: Buffer.from(password)
   }).then(res => {
     if (res.stderr.length > 0 && res.exitCode != 0) {
       throw new Error(res.stderr.trim());
     }
-    core.info('Login Succeeded!');
+    core.info(`Login Succeeded!`);
   });
 }
+
+export async function loginECR(registry: string, username: string, password: string): Promise<void> {
+  core.info(`Retrieving registries data through AWS SDK...`);
+  const regDatas = await aws.getRegistriesData(registry, username, password);
+  for (const regData of regDatas) {
+    core.info(`Logging into ${regData.registry}...`);
+    await Docker.getExecOutput(['login', '--password-stdin', '--username', regData.username, regData.registry], {
+      ignoreReturnCode: true,
+      silent: true,
+      input: Buffer.from(regData.password)
+    }).then(res => {
+      if (res.stderr.length > 0 && res.exitCode != 0) {
+        throw new Error(res.stderr.trim());
+      }
+      core.info('Login Succeeded!');
+    });
+  }
+}

src/main.ts

@@ -1,3 +1,4 @@
+import * as yaml from 'js-yaml';
 import * as core from '@actions/core';
 import * as actionsToolkit from '@docker/actions-toolkit';
 
@@ -5,21 +6,45 @@ import * as context from './context';
 import * as docker from './docker';
 import * as stateHelper from './state-helper';
 
+interface Auth {
+  registry: string;
+  username: string;
+  password: string;
+  ecr: string;
+}
+
 export async function main(): Promise<void> {
   const inputs: context.Inputs = context.getInputs();
   stateHelper.setLogout(inputs.logout);
 
-  const auths = context.getAuthList(inputs);
-  stateHelper.setRegistries(Array.from(new Map(auths.map(auth => [`${auth.registry}|${auth.configDir}`, {registry: auth.registry, configDir: auth.configDir} as stateHelper.RegistryState])).values()));
+  if (inputs.registryAuth && (inputs.registry || inputs.username || inputs.password || inputs.ecr)) {
+    throw new Error('Cannot use registry-auth with other inputs');
+  }
 
-  if (auths.length === 1) {
-    await docker.login(auths[0]);
+  if (!inputs.registryAuth) {
+    stateHelper.setRegistries([inputs.registry || 'docker.io']);
+    await docker.login(inputs.registry || 'docker.io', inputs.username, inputs.password, inputs.ecr || 'auto');
     return;
   }
 
+  const auths = yaml.load(inputs.registryAuth) as Auth[];
+  if (auths.length == 0) {
+    throw new Error('No registry to login');
+  }
+
+  const registries: string[] = [];
   for (const auth of auths) {
-    await core.group(`Login to ${auth.registry}`, async () => {
-      await docker.login(auth);
+    if (!auth.registry) {
+      registries.push('docker.io');
+    } else {
+      registries.push(auth.registry);
+    }
+  }
+  stateHelper.setRegistries(registries.filter((value, index, self) => self.indexOf(value) === index));
+
+  for (const auth of auths) {
+    await core.group(`Login to ${auth.registry || 'docker.io'}`, async () => {
+      await docker.login(auth.registry || 'docker.io', auth.username, auth.password, auth.ecr || 'auto');
     });
   }
 }
@@ -28,10 +53,8 @@ async function post(): Promise<void> {
   if (!stateHelper.logout) {
     return;
   }
-  for (const registryState of stateHelper.registries) {
-    await core.group(`Logout from ${registryState.registry}`, async () => {
-      await docker.logout(registryState.registry, registryState.configDir);
-    });
+  for (const registry of stateHelper.registries.split(',')) {
+    await docker.logout(registry);
   }
 }
 

src/state-helper.ts

@@ -1,15 +1,10 @@
 import * as core from '@actions/core';
 
-export const registries = process.env['STATE_registries'] ? (JSON.parse(process.env['STATE_registries']) as Array<RegistryState>) : [];
+export const registries = process.env['STATE_registries'] || '';
 export const logout = /true/i.test(process.env['STATE_logout'] || '');
 
-export interface RegistryState {
-  registry: string;
-  configDir: string;
-}
-
-export function setRegistries(registries: Array<RegistryState>) {
-  core.saveState('registries', JSON.stringify(registries));
+export function setRegistries(registries: string[]) {
+  core.saveState('registries', registries.join(','));
 }
 
 export function setLogout(logout: boolean) {