Merge fd2fc5e1bd into 4e4ee680f6

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

.eslintrc.json

@@ -13,7 +13,7 @@
   ],
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "ecmaVersion": "latest",
+    "ecmaVersion": "2023",
     "sourceType": "module"
   },
   "plugins": [

.github/workflows/ci.yml

@@ -1013,23 +1013,6 @@ jobs:
           build-contexts: |
             alpine=docker-image://localhost:5000/my-base-image:latest
 
-  docker-config-malformed:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Set malformed docker config
-        run: |
-          mkdir -p ~/.docker
-          echo 'foo_bar' >> ~/.docker/config.json
-      -
-        name: Build
-        uses: ./
-        with:
-          context: ./test
-
   proxy-docker-config:
     runs-on: ubuntu-latest
     services:

src/main.ts

@@ -1,5 +1,4 @@
 import * as fs from 'fs';
-import * as path from 'path';
 import * as stateHelper from './state-helper';
 import * as core from '@actions/core';
 import * as actionsToolkit from '@docker/actions-toolkit';
@@ -9,7 +8,6 @@ import {Exec} from '@docker/actions-toolkit/lib/exec';
 import {GitHub} from '@docker/actions-toolkit/lib/github';
 import {Inputs as BuildxInputs} from '@docker/actions-toolkit/lib/buildx/inputs';
 import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
-import {ConfigFile} from '@docker/actions-toolkit/lib/types/docker';
 
 import * as context from './context';
 
@@ -36,16 +34,9 @@ actionsToolkit.run(
       }
     });
 
-    await core.group(`Proxy configuration`, async () => {
+    const dockerConfig = await Docker.configFile();
-      let dockerConfig: ConfigFile | undefined;
+    if (dockerConfig && dockerConfig.proxies) {
-      let dockerConfigMalformed = false;
+      await core.group(`Proxy configuration found`, async () => {
-      try {
-        dockerConfig = await Docker.configFile();
-      } catch (e) {
-        dockerConfigMalformed = true;
-        core.warning(`Unable to parse config file ${path.join(Docker.configDir, 'config.json')}: ${e}`);
-      }
-      if (dockerConfig && dockerConfig.proxies) {
         for (const host in dockerConfig.proxies) {
           let prefix = '';
           if (Object.keys(dockerConfig.proxies).length > 1) {
@@ -56,10 +47,8 @@ actionsToolkit.run(
             core.info(`${prefix}${key}: ${dockerConfig.proxies[host][key]}`);
           }
         }
-      } else if (!dockerConfigMalformed) {
+      });
-        core.info('No proxy configuration found');
+    }
-      }
-    });
 
     if (!(await toolkit.buildx.isAvailable())) {
       core.setFailed(`Docker buildx is required. See https://github.com/docker/setup-buildx-action to set up buildx.`);

tsconfig.json

@@ -1,8 +1,9 @@
 {
   "compilerOptions": {
     "esModuleInterop": true,
-    "target": "es6",
+    "target": "ES2022",
-    "module": "commonjs",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "strict": true,
     "newLine": "lf",
     "outDir": "./lib",