actions/docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

assembled docker args

Browse Source
This commit is contained in:
David Hiendl 2023-12-02 20:41:39 +01:00
parent 309290f1cf
commit 83b8391793
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/index.js vendored
View File

@ -62142,7 +62142,7 @@ function addCiRegistryAuth(ci_registry, registryAuthJson) {
return; return;
} }
registryAuthJson.auths[ci_registry] = gBase64.encode('token:' + argCiRegistryPassword); registryAuthJson.auths[ci_registry] = {'auth': gBase64.encode('token:' + argCiRegistryPassword)};
} }
function mergeArgRegistryAuthJson(registryAuthJson) { function mergeArgRegistryAuthJson(registryAuthJson) {
@ -62268,8 +62268,9 @@ function prepareDockerArgs(destinations) {
function executeDockerBuild(dockerArgs) { function executeDockerBuild(dockerArgs) {
const dockerArgsStr = dockerArgs.join(' '); const dockerArgsStr = dockerArgs.join(' ');
const dockerSubCmd = core.getBooleanInput('use_buildx') ? 'buildx' : 'build';
const proc = external_child_process_namespaceObject.spawnSync('docker ' + dockerArgsStr, { const proc = external_child_process_namespaceObject.spawnSync(`docker ${dockerSubCmd} ${dockerArgsStr}`, {
shell: true, shell: true,
stdio: 'inherit', stdio: 'inherit',
cwd : getDockerContextDir() cwd : getDockerContextDir()

5
src/lib.js
View File

@ -40,7 +40,7 @@ export function addCiRegistryAuth(ci_registry, registryAuthJson) {
return; return;
} }
registryAuthJson.auths[ci_registry] = Base64.encode('token:' + argCiRegistryPassword); registryAuthJson.auths[ci_registry] = {'auth': Base64.encode('token:' + argCiRegistryPassword)};
} }
export function mergeArgRegistryAuthJson(registryAuthJson) { export function mergeArgRegistryAuthJson(registryAuthJson) {
@ -166,8 +166,9 @@ export function prepareDockerArgs(destinations) {
export function executeDockerBuild(dockerArgs) { export function executeDockerBuild(dockerArgs) {
const dockerArgsStr = dockerArgs.join(' '); 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, shell: true,
stdio: 'inherit', stdio: 'inherit',
cwd : getDockerContextDir() cwd : getDockerContextDir()