add ssh option (#144)

mr-smithers-excellent · Apr 3, 2023 · b61506f · b61506f
1 parent af6e4cb
commit b61506f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/action.yml b/action.yml
@@ -30,6 +30,9 @@ inputs:
   platform:
     description: "Docker build platform passed via --platform"
     required: false
+  ssh:
+    description: "Docker build ssh options passed via --ssh"
+    required: false
   username:
     description: "Docker registry username"
     required: false

diff --git a/dist/index.js b/dist/index.js
@@ -9458,7 +9458,8 @@ const buildOpts = {
   overrideDriver: false,
   enableBuildKit: false,
   platform: undefined,
-  skipPush: false
+  skipPush: false,
+  ssh: undefined
 };
 
 const setBuildOpts = (addLatest, addTimestamp) => {
@@ -9472,6 +9473,7 @@ const setBuildOpts = (addLatest, addTimestamp) => {
   buildOpts.enableBuildKit = core.getInput('enableBuildKit') === 'true';
   buildOpts.platform = core.getInput('platform');
   buildOpts.skipPush = core.getInput('pushImage') === 'false';
+  buildOpts.ssh = parseArray(core.getInput('ssh'));
 };
 
 const run = () => {
@@ -9598,6 +9600,11 @@ const createBuildCommand = (imageName, dockerfile, buildOpts) => {
     buildCommandPrefix = `${buildCommandPrefix} --push`;
   }
 
+  if (buildOpts.ssh) {
+    const sshSuffix = buildOpts.ssh.map(ssh => `--ssh ${ssh}`).join(' ');
+    buildCommandPrefix = `${buildCommandPrefix} ${sshSuffix}`;
+  }
+
   if (buildOpts.enableBuildKit) {
     buildCommandPrefix = `DOCKER_BUILDKIT=1 ${buildCommandPrefix}`;
   }

diff --git a/src/docker-build-push.js b/src/docker-build-push.js
@@ -13,7 +13,8 @@ const buildOpts = {
   overrideDriver: false,
   enableBuildKit: false,
   platform: undefined,
-  skipPush: false
+  skipPush: false,
+  ssh: undefined
 };
 
 const setBuildOpts = (addLatest, addTimestamp) => {
@@ -27,6 +28,7 @@ const setBuildOpts = (addLatest, addTimestamp) => {
   buildOpts.enableBuildKit = core.getInput('enableBuildKit') === 'true';
   buildOpts.platform = core.getInput('platform');
   buildOpts.skipPush = core.getInput('pushImage') === 'false';
+  buildOpts.ssh = parseArray(core.getInput('ssh'));
 };
 
 const run = () => {

diff --git a/src/docker.js b/src/docker.js
@@ -83,6 +83,11 @@ const createBuildCommand = (imageName, dockerfile, buildOpts) => {
     buildCommandPrefix = `${buildCommandPrefix} --push`;
   }
 
+  if (buildOpts.ssh) {
+    const sshSuffix = buildOpts.ssh.map(ssh => `--ssh ${ssh}`).join(' ');
+    buildCommandPrefix = `${buildCommandPrefix} ${sshSuffix}`;
+  }
+
   if (buildOpts.enableBuildKit) {
     buildCommandPrefix = `DOCKER_BUILDKIT=1 ${buildCommandPrefix}`;
   }

diff --git a/tests/docker-build-push.test.js b/tests/docker-build-push.test.js
@@ -24,7 +24,7 @@ const mockRepoName = 'some-repo';
 
 const runAssertions = (imageFullName, inputs, tagOverrides) => {
   // Inputs
-  expect(core.getInput).toHaveBeenCalledTimes(18);
+  expect(core.getInput).toHaveBeenCalledTimes(19);
 
   // Outputs
   const tags = tagOverrides || parseArray(inputs.tags);