Issue 469 - Add options param to docker pull and docker push commands

jfrog-tasks-utils/utils.d.ts

@@ -37,6 +37,7 @@ declare module '@jfrog/tasks-utils' {
     export function configureDefaultDistributionServer(usageType: string, cliPath: string, workDir: string): string;
     export function taskDefaultCleanup(cliPath: string, workDir: string, serverIdsArray: string[]): string;
     export function appendBuildFlagsToCliCommand(cliCommand: string): string;
+    export function appendOptionsToCliCommand(cliCommand: string): string;
     export function isToolExists(tool: string): boolean;
     export function removeExtractorsDownloadVariables(cliPath: string, workDir: string);
     export function configureArtifactoryCliServer(artifactoryService: string, serverId: string, cliPath: string, buildDir: string);

jfrog-tasks-utils/utils.js

@@ -61,6 +61,7 @@ module.exports = {
     createBuildToolConfigFile: createBuildToolConfigFile,
     assembleUniqueServerId: assembleUniqueServerId,
     appendBuildFlagsToCliCommand: appendBuildFlagsToCliCommand,
+    appendOptionsToCliCommand: appendOptionsToCliCommand,
     compareVersions: compareVersions,
     addTrailingSlashIfNeeded: addTrailingSlashIfNeeded,
     useCliServer: useCliServer,
@@ -765,6 +766,17 @@ function appendBuildFlagsToCliCommand(cliCommand) {
     return cliCommand;
 }
 
+/**
+ * Appends options param to provided cli command if command options not blank.
+ * */
+function appendOptionsToCliCommand(cliCommand) {
+    let cmdOptions = tl.getInput('cmdOptions', true) ?? '';
+    if (cmdOptions != '') {
+        cliCommand = cliJoin(cliCommand, cmdOptions);
+    }
+    return cliCommand;
+}
+
 /**
  * Returns the current timestamp in seconds
  */

tasks/JFrogDocker/docker.ts

@@ -20,7 +20,10 @@ function RunTaskCbk(cliPath: string): void {
     const command: string = tl.getInput('command', true) ?? '';
     let cliCommand: string = utils.cliJoin(cliPath, cliDockerCommand, command.toLowerCase(), utils.quote(imageName));
     switch (command) {
-        case 'Push':
+        case 'Push': {
+            cliCommand = utils.appendOptionsToCliCommand(cliCommand);
+            break;
+        }
         case 'Pull': {
             serverId = utils.configureDefaultArtifactoryServer('docker_' + command, cliPath, defaultWorkDir);
             cliCommand = utils.appendBuildFlagsToCliCommand(cliCommand);

tasks/JFrogDocker/task.json

@@ -230,6 +230,16 @@
             "required": true,
             "groupName": "advanced",
             "helpMarkDown": "Select if you'd like the command to skip performing docker login."
+        },
+        {
+            "name": "cmdOptions",
+            "type": "string",
+            "label": "Options",
+            "defaultValue": "",
+            "required": false,
+            "groupName": "advanced",
+            "visibleRule": "command != Scan",
+            "helpMarkDown": "Options for Pull and Push docker command."
         }
     ],
     "execution": {

tests/resources/docker/pull.js

@@ -7,6 +7,7 @@ let inputs = {
     command: 'Pull',
     collectBuildInfo: true,
     imageName: `${platformDockerDomain}/docker-local/docker-test:1`,
+    cmdOptions: `--all-tags`,
 };
 
 testUtils.runArtifactoryTask(testUtils.docker, {}, inputs);

tests/resources/docker/push.js

@@ -7,6 +7,7 @@ let inputs = {
     command: 'Push',
     collectBuildInfo: true,
     imageName: `${platformDockerDomain}/docker-local/docker-test:1`,
+    cmdOptions: ``,
 };
 
 testUtils.runArtifactoryTask(testUtils.docker, {}, inputs);