|
@@ -73,6 +73,9 @@ composeFiles="-f docker-compose.yml"
|
|
|
if [[ ${APP_ENV} == "development" ]]; then
|
|
|
composeFiles="${composeFiles} -f docker-compose.dev.yml"
|
|
|
fi
|
|
|
+if [[ ${CONTAINER_MODE} == "local" ]]; then
|
|
|
+ composeFiles="${composeFiles} -f docker-compose.local.yml"
|
|
|
+fi
|
|
|
if [[ -f docker-compose.override.yml ]]; then
|
|
|
composeFiles="${composeFiles} -f docker-compose.override.yml"
|
|
|
fi
|
|
@@ -305,17 +308,20 @@ handleLinting()
|
|
|
set +e
|
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *frontend* ]]; then
|
|
|
echo -e "${CYAN}Running frontend lint...${NC}"
|
|
|
- ${dockerCompose} exec -T frontend npm run lint -- "${cache}" "${fix}"
|
|
|
+ # shellcheck disable=SC2086
|
|
|
+ ${dockerCompose} exec -T frontend npm run lint -- ${cache} ${fix}
|
|
|
frontendExitValue=$?
|
|
|
fi
|
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *backend* ]]; then
|
|
|
echo -e "${CYAN}Running backend lint...${NC}"
|
|
|
- ${dockerCompose} exec -T backend npm run lint -- "${cache}" "${fix}"
|
|
|
+ # shellcheck disable=SC2086
|
|
|
+ ${dockerCompose} exec -T backend npm run lint -- ${cache} ${fix}
|
|
|
backendExitValue=$?
|
|
|
fi
|
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *docs* ]]; then
|
|
|
echo -e "${CYAN}Running docs lint...${NC}"
|
|
|
- ${docker} run --rm -v "${scriptLocation}":/workdir ghcr.io/igorshubovych/markdownlint-cli:latest ".wiki" "*.md" "${fix}"
|
|
|
+ # shellcheck disable=SC2086
|
|
|
+ ${docker} run --rm -v "${scriptLocation}":/workdir ghcr.io/igorshubovych/markdownlint-cli:latest ".wiki" "*.md" ${fix}
|
|
|
docsExitValue=$?
|
|
|
fi
|
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *shell* ]]; then
|
|
@@ -351,12 +357,14 @@ handleTypescript()
|
|
|
set +e
|
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *frontend* ]]; then
|
|
|
echo -e "${CYAN}Running frontend typescript check...${NC}"
|
|
|
- ${dockerCompose} exec -T frontend npm run typescript -- "${strict}"
|
|
|
+ # shellcheck disable=SC2086
|
|
|
+ ${dockerCompose} exec -T frontend npm run typescript -- ${strict}
|
|
|
frontendExitValue=$?
|
|
|
fi
|
|
|
if [[ ${servicesString:2:4} == "all" || "${servicesString:2}" == *backend* ]]; then
|
|
|
echo -e "${CYAN}Running backend typescript check...${NC}"
|
|
|
- ${dockerCompose} exec -T backend npm run typescript -- "${strict}"
|
|
|
+ # shellcheck disable=SC2086
|
|
|
+ ${dockerCompose} exec -T backend npm run typescript -- ${strict}
|
|
|
backendExitValue=$?
|
|
|
fi
|
|
|
set -e
|
|
@@ -368,8 +376,7 @@ handleTypescript()
|
|
|
# Execute automated tests in services
|
|
|
handleTests()
|
|
|
{
|
|
|
- # shellcheck disable=SC2068
|
|
|
- servicesString=$(handleServices "backend frontend" ${services[@]})
|
|
|
+ servicesString=$(handleServices "backend frontend" "${@:2}")
|
|
|
if [[ ${servicesString:0:1} != 1 ]]; then
|
|
|
throw "${servicesString:2}\n${YELLOW}Usage: ${1} [backend, frontend]"
|
|
|
fi
|