From 0c50f7ef55fe271489b33dde5853b332dcb71983 Mon Sep 17 00:00:00 2001 From: Johnny Hausman Date: Tue, 17 Mar 2026 17:59:05 -0500 Subject: [PATCH 1/3] [fix] revert file_processor in .dev mode to use image:node --- templates/setup/docker-compose.dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/setup/docker-compose.dev.yml b/templates/setup/docker-compose.dev.yml index b17322c..5ce3056 100644 --- a/templates/setup/docker-compose.dev.yml +++ b/templates/setup/docker-compose.dev.yml @@ -214,7 +214,7 @@ services: #file_processor: A service to manage uploaded files. file_processor: - image: docker.io/digiserve/ab-file-processor:$AB_FILE_PROCESSOR_VERSION + image: node environment: - COTE_DISCOVERY_REDIS_HOST=redis - MYSQL_PASSWORD From 4853d2b367e98071c777b2bf7580860e96f0f9fb Mon Sep 17 00:00:00 2001 From: Johnny Hausman Date: Tue, 17 Mar 2026 18:39:33 -0500 Subject: [PATCH 2/3] [wip] also assume the default cypress stack is test_[stack] --- lib/setup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/setup.js b/lib/setup.js index 48247fc..90445fa 100644 --- a/lib/setup.js +++ b/lib/setup.js @@ -518,7 +518,7 @@ function questions(done) { Options.sailsSessionSecret = nanoid(32); Options.cypressBaseURL = `http://localhost:${Options.port ?? 80}`; - Options.cypressStack = Options.stack ?? "ab"; + Options.cypressStack = `test_${Options.stack ?? "ab"}`; // console.log("Options:", Options); settingTags.then(done); From 3b9362ca32603794fa3817512870b8d4a1d1b002 Mon Sep 17 00:00:00 2001 From: Johnny Hausman Date: Wed, 18 Mar 2026 14:11:18 -0500 Subject: [PATCH 3/3] [wip] actually the changes were important, so now we use api_sails image too --- templates/setup/docker-compose.dev.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/templates/setup/docker-compose.dev.yml b/templates/setup/docker-compose.dev.yml index 5ce3056..b0af68c 100644 --- a/templates/setup/docker-compose.dev.yml +++ b/templates/setup/docker-compose.dev.yml @@ -56,7 +56,9 @@ services: #api_sails: our API end point api_sails: - image: node + # NOTE: since our file_processor is using our docker image, we should use + # our api-sails image so USER permissions are correct between the two services. + image: docker.io/digiserve/ab-api-sails:$AB_API_SAILS_VERSION environment: - COTE_DISCOVERY_REDIS_HOST=redis - NODE_ENV=development @@ -92,8 +94,9 @@ services: - files:/data depends_on: - redis - working_dir: /app - command: ["node", "--inspect=0.0.0.0:9229", "app_waitMysql.js"] + # NOTE: our working image already sets this up: + # working_dir: /app + # command: ["node", "--inspect=0.0.0.0:9229", "app_waitMysql.js"] #/api_sails #appbuilder: (AppBuilder) A multi-tenant aware service to process our AppBuilder requests. @@ -214,7 +217,9 @@ services: #file_processor: A service to manage uploaded files. file_processor: - image: node + # NOTE: our docker image contains additional utils not found in the node + # image, so we use that instead. + image: docker.io/digiserve/ab-file-processor:$AB_FILE_PROCESSOR_VERSION environment: - COTE_DISCOVERY_REDIS_HOST=redis - MYSQL_PASSWORD