inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check if args is array or string

Browse Source
This commit is contained in:
Maurizio Vitale
2021-10-13 12:52:45 +01:00
parent 033ac9ebae
commit 70476da76c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cli/scripts/docker.ts
View File

@@ -50,9 +50,13 @@ function buildImagePerform(args: PublishArgs, tag: string) {
let buildArgs = [];
args.buildArgs.forEach((envVar) => {
buildArgs.push (`--build-arg=${envVar}`);
});
if (typeof args.buildArgs === "string") {
buildArgs.push(`--build-arg=${args.buildArgs}`);
} else {
args.buildArgs.forEach((envVar) => {
buildArgs.push (`--build-arg=${envVar}`);
});
}
const response = exec('docker', ['build', `-t=${args.dockerRepo}:${tag}`, ...buildArgs, args.pathProject], {});
logger.info(response);

4
scripts/travis/release/release-docker.sh
View File

@@ -33,14 +33,14 @@ then
echo "ℹ️ demo-shell: Running the docker with tag" $TAGS
DOCKER_PROJECT_ARGS="PROJECT_NAME=demo-shell"
DOCKER_PROJECT_ARGS=("PROJECT_NAME=demo-shell")
# Publish Image to docker
./node_modules/@alfresco/adf-cli/bin/adf-cli docker --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --buildArgs "$DOCKER_PROJECT_ARGS" --dockerTags "$TAGS" --pathProject "$(pwd)"
echo "ℹ️ storybook-shell: Running the docker with tag" $TAGS
DOCKER_PROJECT_ARGS="PROJECT_NAME=storybook/process-services-cloud"
DOCKER_PROJECT_ARGS=("PROJECT_NAME=storybook/process-services-cloud")
# Publish Image to docker
./node_modules/@alfresco/adf-cli/bin/adf-cli docker --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY_STORYBOOK" --buildArgs "$DOCKER_PROJECT_ARGS" --dockerTags "$TAGS" --pathProject "$(pwd)"