feat: add support for extraFlag for docker subcommand

apache-superset · Jul 30, 2024 · fb3744b · fb3744b
1 parent 3e02705
commit fb3744b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/cli.js b/src/cli.js
@@ -191,17 +191,19 @@ export default function getCLI(context) {
       .option('-r, --context-ref <ref>', 'Reference to the PR, release, or branch')
       .option('-p, --platform <platform...>', 'Platforms (multiple values allowed)')
       .option('-f, --force-latest', 'Force the "latest" tag on the release')
+      .option('-x, --extra-flags <extraFlags>', 'Pass a extra flags to the docker build command')
       .option('-v, --verbose', 'Print more info')
       .action(async function () {
         const opts = context.processOptions(this, ['preset', 'repo']);
         opts.platform = opts.platform || ['linux/arm64'];
         const github = new Github({ context });
         const buildContext = opts.context;
         const buildContextRef = opts.contextRef;
+        const extraFlags = opts.extraFlags;
         const latestRelease = await github.getLatestReleaseTag();
         console.log(`Latest release: ${latestRelease}`);
         const command = await docker.getDockerCommand({
-          ...opts, buildContext, buildContextRef, latestRelease,
+          ...opts, buildContext, buildContextRef, latestRelease, extraFlags,
         });
         context.log(command);
         if (!opts.dryRun) {

diff --git a/src/docker.js b/src/docker.js
@@ -71,6 +71,7 @@ export function getDockerTags({
 
 export async function getDockerCommand({
   preset, platform, buildContext, buildContextRef, forceLatest = false, latestRelease = null,
+  extraFlags = '',
 }) {
   const platforms = platform;
 
@@ -130,6 +131,7 @@ export async function getDockerCommand({
       --label base=${pyVer} \\
       --label build_actor=${actor} \\
       ${versionLabel} \\
+      ${extraFlags} \\
       ${dockerContext}
   `;
 }
diff --git a/src/docker.test.js b/src/docker.test.js
@@ -230,6 +230,7 @@ describe('getDockerCommand', () => {
       SHA,
       'push',
       'master',
+      '',
       [`-t ${REPO}:master `],
     ],
     [
@@ -238,20 +239,31 @@ describe('getDockerCommand', () => {
       SHA,
       'push',
       'master',
+      '',
       ['--load', `-t ${REPO}:master-dev `],
     ],
+    [
+      'dev',
+      ['linux/amd64'],
+      SHA,
+      'push',
+      'master',
+      '--cpus 1',
+      ['--cpus 1'],
+    ],
     // multi-platform
     [
       'lean',
       ['linux/arm64', 'linux/amd64'],
       SHA,
       'push',
       'master',
+      '',
       ['--platform linux/arm64,linux/amd64'],
     ],
-  ])('returns expected docker command', async (preset, platform, sha, buildContext, buildContextRef, contains) => {
+  ])('returns expected docker command', async (preset, platform, sha, buildContext, buildContextRef, extraFlags, contains) => {
     const cmd = await dockerUtils.getDockerCommand({
-      preset, platform, sha, buildContext, buildContextRef, latestRelease: NEW_REL,
+      preset, platform, sha, buildContext, buildContextRef, extraFlags, latestRelease: NEW_REL,
     });
     contains.forEach((expectedSubstring) => {
       expect(cmd).toContain(expectedSubstring);