user docker compose

medic · Sep 28, 2024 · e8bfd0f · e8bfd0f
1 parent acc81de
commit e8bfd0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/test/e2e/utils.js b/test/e2e/utils.js
@@ -9,7 +9,6 @@ const NETWORK = 'the_network';
 const PROJECT_NAME = 'the_project';
 process.env.NETWORK = NETWORK;
 process.env.CHT_COMPOSE_PROJECT_NAME = PROJECT_NAME;
-const DOCKER_COMPOSE_CLI = 'docker-compose';
 const DOCKER_COMPOSE_FILE = path.resolve(__dirname, '..', 'test-data', 'docker-compose.test.yml');
 
 const dockerComposeFolder = path.resolve(__dirname, '..', 'test-data', 'docker-compose');
@@ -68,14 +67,15 @@ const runScript = (file, ...args) => {
 const dockerCommand = (files, ...params) => {
   files = Array.isArray(files) ? files : [files];
   const args = [
+    'compose',
     ...files.map(file => (['-f', file])),
     ...params.filter(param => param).map(param => param.split(' ')),
   ].flat();
 
-  console.log(DOCKER_COMPOSE_CLI, ...args);
+  console.log('docker', ...args);
 
   return new Promise((resolve, reject) => {
-    const proc = spawn(DOCKER_COMPOSE_CLI, args, { env: { ...process.env, ...env } });
+    const proc = spawn('docker', args, { env: { ...process.env, ...env } });
     proc.on('error', (err) => reject(err));
 
     let err = '';

diff --git a/test/test-data/docker-compose.test.yml b/test/test-data/docker-compose.test.yml
@@ -1,4 +1,3 @@
-version: '3.9'
 services:
   cht-upgrade-service:
     build: ../../