From 82888de0364cac5b01420786e4ff2265a3070468 Mon Sep 17 00:00:00 2001 From: Tim Perry Date: Mon, 9 Oct 2017 19:10:50 +0200 Subject: [PATCH 1/2] Document how to `resin deploy` to an app as a collaborator Change-Type: patch --- build/actions/deploy.js | 2 +- doc/cli.markdown | 5 ++++- lib/actions/deploy.coffee | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build/actions/deploy.js b/build/actions/deploy.js index 23cd45e4..92b3ec8e 100644 --- a/build/actions/deploy.js +++ b/build/actions/deploy.js @@ -152,7 +152,7 @@ uploadToPromise = function(uploadRequest, logger) { module.exports = { signature: 'deploy [image]', description: 'Deploy an image to a resin.io application', - help: 'Use this command to deploy an image to an application, optionally building it first.\n\nUsage: deploy ([image] | --build [--source build-dir])\n\nNote: If building with this command, all options supported by `resin build`\nare also supported with this command.\n\nExamples:\n $ resin deploy myApp --build --source myBuildDir/\n $ resin deploy myApp myApp/myImage', + help: 'Use this command to deploy an image to an application, optionally building it first.\n\nUsage: `deploy ([image] | --build [--source build-dir])`\n\nTo deploy to an app on which you\'re a collaborator, use\n`resin deploy /`.\n\nNote: If building with this command, all options supported by `resin build`\nare also supported with this command.\n\nExamples:\n $ resin deploy myApp --build --source myBuildDir/\n $ resin deploy myApp myApp/myImage', permission: 'user', options: dockerUtils.appendOptions([ { diff --git a/doc/cli.markdown b/doc/cli.markdown index c1ea7cb6..d1b39ec5 100644 --- a/doc/cli.markdown +++ b/doc/cli.markdown @@ -1414,7 +1414,10 @@ Squash newly built layers into a single new layer Use this command to deploy an image to an application, optionally building it first. -Usage: deploy ([image] | --build [--source build-dir]) +Usage: `deploy ([image] | --build [--source build-dir])` + +To deploy to an app on which you're a collaborator, use +`resin deploy /`. Note: If building with this command, all options supported by `resin build` are also supported with this command. diff --git a/lib/actions/deploy.coffee b/lib/actions/deploy.coffee index 1408ff6d..a0ddbb1a 100644 --- a/lib/actions/deploy.coffee +++ b/lib/actions/deploy.coffee @@ -114,7 +114,10 @@ module.exports = help: ''' Use this command to deploy an image to an application, optionally building it first. - Usage: deploy ([image] | --build [--source build-dir]) + Usage: `deploy ([image] | --build [--source build-dir])` + + To deploy to an app on which you're a collaborator, use + `resin deploy /`. Note: If building with this command, all options supported by `resin build` are also supported with this command. From 8af392029f278b4204492a3cbe5e23038a8b04c2 Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Fri, 13 Oct 2017 14:26:20 +0000 Subject: [PATCH 2/2] v6.6.11 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68e6d171..59eaee57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! This project adheres to [Semantic Versioning](http://semver.org/). +## v6.6.11 - 2017-10-13 + +* Document how to `resin deploy` to an app as a collaborator #685 [Tim Perry] + ## v6.6.10 - 2017-10-09 * Ensure hostname truly is optional when configuring device images #676 [Tim Perry] diff --git a/package.json b/package.json index b4e9c703..4ee04a64 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "resin-cli", - "version": "6.6.10", + "version": "6.6.11", "description": "The official resin.io CLI tool", "main": "./build/actions/index.js", "homepage": "https://github.com/resin-io/resin-cli",