assembled docker args

2023-12-02 20:41:39 +01:00
parent 309290f1cf
commit 83b8391793
2 changed files with 6 additions and 4 deletions
@@ -40,7 +40,7 @@ export function addCiRegistryAuth(ci_registry, registryAuthJson) {
    return;
  }

-  registryAuthJson.auths[ci_registry] = Base64.encode('token:' + argCiRegistryPassword);
+  registryAuthJson.auths[ci_registry] = {'auth': Base64.encode('token:' + argCiRegistryPassword)};
 }

 export function mergeArgRegistryAuthJson(registryAuthJson) {
@@ -166,8 +166,9 @@ export function prepareDockerArgs(destinations) {

 export function executeDockerBuild(dockerArgs) {
  const dockerArgsStr = dockerArgs.join(' ');
+  const dockerSubCmd  = core.getBooleanInput('use_buildx') ? 'buildx' : 'build';

-  const proc = child_process.spawnSync('docker ' + dockerArgsStr, {
+  const proc = child_process.spawnSync(`docker ${dockerSubCmd} ${dockerArgsStr}`, {
    shell: true,
    stdio: 'inherit',
    cwd  : getDockerContextDir()