Deploy PR on request (#5642)

* deploy PR on request

* [create peview]

* [create peview]

* script fix [create preview]

* [create peview]

* change creation preview

* [create peview]

* Update deploy-pr.sh

* [create peview]

* update node and dist

* [create peview]

* [create peview]

* [create peview]

* [create peview]

* [create peview]

* [create peview]

* [create peview]

* [create preview]

* subfolder issue

* [create preview]

* [create preview]

* [create preview]

* [create preview]

* [create preview]

* [create preview]

scripts/travis/deploy/deploy-pr.sh

@@ -9,10 +9,16 @@ TAG_VERSION=$(./scripts/travis/deploy/get-docker-image-tag-name.sh)
 echo "Running the docker with tag" $TAG_VERSION
 
 # Publish Image to docker
-node ./scripts/travis/deploy/move-dist-folder.js --base-href $TRAVIS_BUILD_NUMBER
+
+mkdir  "./demo-shell/tmp/"
+mv ./demo-shell/dist/* ./demo-shell/tmp
+
+mkdir  -p "./demo-shell/dist/${TRAVIS_BUILD_NUMBER}"
+mv ./demo-shell/tmp/* ./demo-shell/dist/${TRAVIS_BUILD_NUMBER}
+
 ./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" --pathProject "$(pwd)"
 
 echo "Update rancher with docker tag" $TAG_VERSION  --url $REPO_RANCHER --environment_name $REPO_RANCHER_ADF_NAME
 
 # Deploy PR in Rancher env
-(node --no-deprecation ./scripts/travis/deploy/rancher-pr-deploy.js -n $TRAVIS_BUILD_NUMBER -u $RANCHER_TOKEN -p $RANCHER_SECRET -s $REPO_RANCHER --image "docker:$REPO_DOCKER/adf/demo-shell:$TRAVIS_BUILD_NUMBER" --env $ENVIRONMENT_NAME -r $ENVIRONMENT_URL || exit 1);
+(node --no-deprecation ./scripts/travis/deploy/rancher-pr-deploy.js -n $TRAVIS_BUILD_NUMBER -u $RANCHER_TOKEN -p $RANCHER_SECRET -s $REPO_RANCHER --image "alfresco/demo-shell:develop-$TRAVIS_BUILD_NUMBER" --env $ENVIRONMENT_NAME -r $ENVIRONMENT_URL || exit 1);

scripts/travis/deploy/move-dist-folder.js

@@ -1,63 +0,0 @@
-var program = require('commander');
-var fs = require('fs');
-var path = require('path');
-var ncp = require('ncp').ncp;
-var rimraf = require('rimraf');
-
-ncp.limit = 16;
-
-replaceHrefInIndex = (href) => {
-    fs.readFile(`demo-shell/dist/${href}/index.html`, 'utf8', function (err, data) {
-        if (err) {
-            return console.log(err);
-        }
-
-        let result = data.replace(`base href="/"`, `base href=\"/${href}/\"`);
-
-        fs.writeFile(`demo-shell/dist/${href}/index.html`, result, 'utf8', function (err) {
-            if (err) return console.log(err);
-        });
-    });
-};
-
-
-async function main() {
-
-    program
-        .version('0.1.0')
-        .option('--base-href  [type]', '')
-        .parse(process.argv);
-
-
-    let outputTemp = path.resolve(__dirname, '../../../demo-shell/', program.baseHref);
-    console.log('output ' + outputTemp);
-
-    let distFolder = path.resolve(__dirname, '../../../demo-shell/dist');
-
-    fs.rename(distFolder, outputTemp, (err) => {
-        if (err) throw err;
-        console.log('renamed complete');
-
-        let distFolderNew = path.resolve(__dirname, '../../../demo-shell/dist', program.baseHref);
-
-        if (!fs.existsSync(distFolderNew)){
-            fs.mkdirSync(distFolder);
-            fs.mkdirSync(distFolderNew);
-        }
-
-        ncp(outputTemp, distFolderNew, (err) => {
-            if (err) {
-                return console.error(err);
-            }
-
-            replaceHrefInIndex(program.baseHref);
-
-            rimraf(outputTemp,  ()=> { console.log('output temp removed'); });
-
-        });
-
-    });
-
-}
-
-main();

scripts/travis/deploy/rancher-pr-deploy.js

@@ -98,7 +98,7 @@ async function main() {
             "devices": [],
             "logConfig": {"driver": "", "config": {}},
             "dataVolumesFromLaunchConfigs": [],
-            "imageUuid": program.image,
+            "imageUuid": "docker:"+program.image,
             "ports": [],
             "blkioWeight": null,
             "cgroupParent": null,
@@ -172,6 +172,8 @@ async function main() {
         "fqdn": null
     };
 
+    console.log("Create Service ");
+
     var createService = await asyncRequest({
         url: `${program.server}/v2-beta/projects/${environmentId}/service`,
         method: 'POST',