Added logs to s3 publish

namshi · Jul 2, 2017 · 04796a5 · 04796a5
1 parent f07a6d1
commit 04796a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/docker.js b/src/docker.js
@@ -233,7 +233,7 @@ docker.push = function(image, buildId, uuid, branch, registry, buildLogger) {
  */
 docker.copy = function(container, containerPath, hostPath) {
   return Q.Promise(function(resolve, reject) {
-    container.copy({Resource: containerPath}, function(err, data) {
+    container.export(function(err, data) {
       if (err) {
         reject(err);
         return;

diff --git a/src/publisher/s3.js b/src/publisher/s3.js
@@ -107,7 +107,8 @@ function uploadDirectoryToS3(options) {
 module.exports = function(dockerClient, buildId, project, logger, options){
   return Q.Promise(function(resolve, reject){
     var command = options.command || "sleep 1"; 
-
+    console.info('Started publishing to S3');
+    console.info(buildId);
     dockerClient.run(buildId, command.split(' '), process.stdout, function (err, data, container) {
       if (err) {
         reject(err);
@@ -118,7 +119,7 @@ module.exports = function(dockerClient, buildId, project, logger, options){
           logger.info("[%s] Copied %s outside of the container, in %s, preparing to upload it to S3", buildId, options.copy, artifactPath);
           var o = _.clone(options);
           o.buildId = buildId;
-          o.dir     = artifactPath;
+          o.dir     = path.join(artifactPath, options.copy);
           o.logger  = logger;
 
           uploadDirectoryToS3(o).then(function(){