From e88141ccdf74a06ba16a6a6ef33fcc84d7439c69 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Thu, 26 Nov 2020 17:32:50 +0000 Subject: [PATCH] Fix the build path for docker (#1825) Co-authored-by: MaurizioVitale --- .travis.yml | 2 +- scripts/travis/deploy/publish.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d9cc7945..76ddf44b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -135,7 +135,7 @@ jobs: - stage: Publish Docker Registry name: Publish Docker Registry - script: ./scripts/travis/deploy/publish.sh + script: ./scripts/travis/deploy/publish.sh "app" - stage: Release Tag script: ./scripts/travis/release/git-tag.sh diff --git a/scripts/travis/deploy/publish.sh b/scripts/travis/deploy/publish.sh index f9fd87e19..248df2f41 100755 --- a/scripts/travis/deploy/publish.sh +++ b/scripts/travis/deploy/publish.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - +PROJECT_AFFECTED=$1 cd $DIR/../../../ npm run build @@ -9,6 +9,8 @@ npm run build # Get Tag Image TAG_VERSION=$(./scripts/travis/deploy/get-docker-image-tag-name.sh) echo "Running the docker with tag" $TAG_VERSION +DOCKER_PROJECT_ARGS="PROJECT_NAME=$PROJECT_AFFECTED" # Publish Image to docker -./node_modules/@alfresco/adf-cli/bin/adf-cli docker-publish --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --dockerTags "$TAG_VERSION,$TRAVIS_BRANCH" --pathProject "$(pwd)" +echo "npx @lfresco/adf-cli docker-publish --loginCheck --loginUsername '$DOCKER_REPOSITORY_USER' --loginPassword '$DOCKER_REPOSITORY_PASSWORD' --loginRepo '$DOCKER_REPOSITORY_DOMAIN' --dockerRepo '$DOCKER_REPOSITORY' --buildArgs $DOCKER_PROJECT_ARGS --dockerTags '$TAG_VERSION,$TRAVIS_BRANCH' " +npx docker-publish --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --buildArgs "$DOCKER_PROJECT_ARGS" --dockerTags "$TAG_VERSION,$TRAVIS_BRANCH" --pathProject "$(pwd)"