Fix Docker artifact harness entrypoint handling

Author: TJKoury

deployment/release/test-release-artifacts-docker.mjs

@@ -445,17 +445,17 @@ function writeContainerConfig(workDir, name, bootstrapPeers) {
   return configPath;
 }
 
-function startFullNode({
+export function buildFullNodeRunArgs({
   containerName,
   imageName,
   configPath,
   networkName,
   platform,
   binaryPath = '/opt/spacedatanetwork/bin/spacedatanetwork',
-  configTargetPath = '/etc/spacedatanetwork/config.yaml'
+  configTargetPath = '/etc/spacedatanetwork/config.yaml',
+  entrypoint
 }) {
-  log(`starting ${containerName}`);
-  runDocker([
+  const args = [
     'run',
     '-d',
     '--platform',
@@ -465,25 +465,36 @@ function startFullNode({
     '--network',
     networkName,
     '-v',
-    `${configPath}:${configTargetPath}:ro`,
+    `${configPath}:${configTargetPath}:ro`
+  ];
+  if (entrypoint) {
+    args.push('--entrypoint', entrypoint);
+  }
+  args.push(
     imageName,
-    binaryPath,
+    ...(binaryPath === null ? [] : [binaryPath]),
     'daemon',
     '--config',
     configTargetPath
-  ]);
+  );
+  return args;
+}
+
+function startFullNode(options) {
+  log(`starting ${options.containerName}`);
+  runDocker(buildFullNodeRunArgs(options));
 }
 
-function startEdgeNode({
+export function buildEdgeNodeRunArgs({
   containerName,
   imageName,
   bootstrapPeer,
   networkName,
   platform,
-  binaryPath = '/opt/spacedatanetwork/bin/spacedatanetwork-edge'
+  binaryPath = '/opt/spacedatanetwork/bin/spacedatanetwork-edge',
+  entrypoint
 }) {
-  log(`starting ${containerName}`);
-  runDocker([
+  const args = [
     'run',
     '-d',
     '--platform',
@@ -492,12 +503,23 @@ function startEdgeNode({
     containerName,
     '--network',
     networkName,
+  ];
+  if (entrypoint) {
+    args.push('--entrypoint', entrypoint);
+  }
+  args.push(
     imageName,
-    binaryPath,
+    ...(entrypoint ? [] : [binaryPath]),
     '--listen',
     '/ip4/0.0.0.0/tcp/8080/ws',
     ...generateEdgeArgs({ bootstrapPeer, healthPort: 8081 })
-  ]);
+  );
+  return args;
+}
+
+function startEdgeNode(options) {
+  log(`starting ${options.containerName}`);
+  runDocker(buildEdgeNodeRunArgs(options));
 }
 
 function sleep(ms) {
@@ -630,7 +652,7 @@ async function runNetworkTest({ images, workDir, platform, prefix, timeoutMs })
       configPath: containerConfig,
       networkName,
       platform,
-      binaryPath: '/app/spacedatanetwork',
+      binaryPath: null,
       configTargetPath: '/app/config/full-docker.yaml'
     });
     startEdgeNode({
@@ -639,7 +661,7 @@ async function runNetworkTest({ images, workDir, platform, prefix, timeoutMs })
       bootstrapPeer: seedBootstrap,
       networkName,
       platform,
-      binaryPath: '/app/spacedatanetwork-edge'
+      entrypoint: '/app/spacedatanetwork-edge'
     });
 
     await waitForJson({

deployment/release/test-release-artifacts-docker.test.mjs

@@ -10,7 +10,9 @@ import {
   generateInstallDockerfile,
   generateFullNodeConfig,
   generateEdgeArgs,
-  parseDockerLoadImage
+  parseDockerLoadImage,
+  buildFullNodeRunArgs,
+  buildEdgeNodeRunArgs
 } from './test-release-artifacts-docker.mjs';
 
 const repoRoot = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
@@ -117,6 +119,40 @@ test('network configs bootstrap non-seed nodes to the seed peer', () => {
   ]);
 });
 
+test('container image run args respect the image entrypoint', () => {
+  const packageFullArgs = buildFullNodeRunArgs({
+    containerName: 'sdn-full-deb',
+    imageName: 'sdn-artifact-full-deb:latest',
+    configPath: '/tmp/full.yaml',
+    networkName: 'sdn-net',
+    platform: 'linux/amd64'
+  });
+  const containerFullArgs = buildFullNodeRunArgs({
+    containerName: 'sdn-container-full',
+    imageName: 'dockerdigitalarsenal/space-data-network:v1.0.3-beta.1',
+    configPath: '/tmp/container.yaml',
+    networkName: 'sdn-net',
+    platform: 'linux/amd64',
+    binaryPath: null,
+    configTargetPath: '/app/config/full-docker.yaml'
+  });
+  const containerEdgeArgs = buildEdgeNodeRunArgs({
+    containerName: 'sdn-container-edge',
+    imageName: 'dockerdigitalarsenal/space-data-network:v1.0.3-beta.1',
+    bootstrapPeer: '/dns4/sdn-full-deb/tcp/4001/p2p/12D3KooWSeed',
+    networkName: 'sdn-net',
+    platform: 'linux/amd64',
+    entrypoint: '/app/spacedatanetwork-edge'
+  });
+
+  assert(packageFullArgs.includes('/opt/spacedatanetwork/bin/spacedatanetwork'));
+  assert.deepEqual(containerFullArgs.slice(-3), ['daemon', '--config', '/app/config/full-docker.yaml']);
+  assert(!containerFullArgs.includes('/app/spacedatanetwork'));
+  assert(containerEdgeArgs.includes('--entrypoint'));
+  assert.equal(containerEdgeArgs[containerEdgeArgs.indexOf('--entrypoint') + 1], '/app/spacedatanetwork-edge');
+  assert(!containerEdgeArgs.slice(containerEdgeArgs.indexOf('dockerdigitalarsenal/space-data-network:v1.0.3-beta.1') + 1).includes('/app/spacedatanetwork-edge'));
+});
+
 test('full-node package and VM bundle scripts include the WasmEdge runtime', () => {
   const packageScript = readFileSync(join(repoRoot, 'deployment/packaging/build-linux-packages.sh'), 'utf8');
   const vmScript = readFileSync(join(repoRoot, 'deployment/scripts/package-linux-vm-bundle.sh'), 'utf8');