Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
11 changes: 8 additions & 3 deletions templates/setup/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -214,6 +217,8 @@ services:

#file_processor: A service to manage uploaded files.
file_processor:
# 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
Expand Down
Loading