Publish containers (#1117)

Signed-off-by: [email protected] <[email protected]>

.build/publish-docker.sh

@@ -25,4 +25,4 @@ cp ./README.md ./packages/caliper-fisco-bcos/README.md
 
 cd ./packages/caliper-publish/
 npm i
-./publish.js docker --user klenik --publish
+./publish.js docker --publish

azure-pipelines.yml

@@ -115,3 +115,15 @@ stages:
             displayName: Publish packages
             env:
               NPM_TOKEN: "$(npm)"
+      - job: PublishDocker
+        displayName: "Publish Caliper Docker images"
+        steps:
+          - task: NodeTool@0
+            inputs:
+              versionSpec: "10.x"
+            displayName: "Install Node.js"
+          - script: .build/publish-docker.sh
+            displayName: Publish packages
+            env:
+              DOCKER_USER: "$(DockerHub-Username)"
+              DOCKER_TOKEN: "$(DockerHub-Password)"

packages/caliper-publish/lib/dockerCommand.js

@@ -45,13 +45,7 @@ module.exports.builder = yargs => {
             demand: false,
             default: false,
             type: 'boolean',
-            describe: 'Indicates whether to publish the built image. Requires that DOCKER_TOKEN and "user" argument is set.'
-        },
-        user : {
-            alias: 'u',
-            demand: false,
-            type: 'string',
-            describe: 'The user to use for publishing the built Docker image. Required when the "--publish" flag is set.'
+            describe: 'Indicates whether to publish the built image. Requires that DOCKER_TOKEN and DOCKER_USER export variables are set.'
         },
         retries: {
             alias: 'n',
@@ -67,5 +61,5 @@ module.exports.builder = yargs => {
 };
 
 module.exports.handler = argv => {
-    argv.thePromise = Docker.handler(argv.image, argv.registry, argv.publish, argv.user, argv.retries, argv.tag);
+    argv.thePromise = Docker.handler(argv.image, argv.registry, argv.publish, argv.retries, argv.tag);
 };

packages/caliper-publish/lib/impl/docker.js

@@ -42,13 +42,12 @@ class Docker {
      * Handler for the docker command invocation.
      * @param {string} image The name for the built image.
      * @param {string} registry The NPM registry address to use for building the Docker image. Defaults to the public NPM registry.
-     * @param {boolean} publish Indicates whether to publish the built image. Requires that DOCKER_TOKEN and "user" argument is set.
-     * @param {string} user The user to use for publishing the built Docker image. Required when "publish" is true.
+     * @param {boolean} publish Indicates whether to publish the built image. Requires that DOCKER_TOKEN and DOCKER_USER exports are set.
      * @param {number} retries The number of times to retry the build in case of failures.
      * @param {string} tag Override for the version-based tag for testing purposes.
      * @async
      */
-    static async handler(image, registry, publish, user, retries, tag) {
+    static async handler(image, registry, publish, retries, tag) {
         const cliPackageJsonPath = path.join(packagesRoot, 'caliper-cli', 'package.json');
         const cliPackageVersion = require(cliPackageJsonPath).version;
         const cliPackageName = `@hyperledger/caliper-cli@${cliPackageVersion}`;
@@ -127,7 +126,6 @@ class Docker {
         }
 
         let publishEnvs = {
-            DOCKER_USER: user,
             IMAGE: image,
             TAG: imageTag
         };