ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-02-22 10:11:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #934 via VersionBot

Browse Source 
Add an env vars example config to the local push docs
This commit is contained in:
resin-io-versionbot[bot] 2018-08-09 10:09:37 +00:00 committed by GitHub
commit b6ef251625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -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! automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## v7.8.5 - 2018-08-09
* Update .resin-sync.yml docs for local push and include example env vars #934 [Tim Perry]
## v7.8.4 - 2018-08-02 ## v7.8.4 - 2018-08-02
* Update klaw #936 [Tim Perry] * Update klaw #936 [Tim Perry]

14
doc/cli.markdown
View File

@ -1431,12 +1431,14 @@ also change any option by editing '.resin-sync.yml' directly.
Here is an example '.resin-sync.yml' : Here is an example '.resin-sync.yml' :
$ cat $PWD/.resin-sync.yml $ cat $PWD/.resin-sync.yml
destination: '/usr/src/app' local_resinos:
before: 'echo Hello' app-name: local-app
after: 'echo Done' build-triggers:
ignore: - Dockerfile: file-hash-abcdefabcdefabcdefabcdefabcdefabcdef
- .git - package.json: file-hash-abcdefabcdefabcdefabcdefabcdefabcdef
- node_modules/ environment:
- MY_VARIABLE=123
Command line options have precedence over the ones saved in '.resin-sync.yml'. Command line options have precedence over the ones saved in '.resin-sync.yml'.

14
lib/actions/local/push.coffee
View File

@ -43,12 +43,14 @@ resinPushHelp = '''
Here is an example '.resin-sync.yml' : Here is an example '.resin-sync.yml' :
$ cat $PWD/.resin-sync.yml $ cat $PWD/.resin-sync.yml
destination: '/usr/src/app' local_resinos:
before: 'echo Hello' app-name: local-app
after: 'echo Done' build-triggers:
ignore: - Dockerfile: file-hash-abcdefabcdefabcdefabcdefabcdefabcdef
- .git - package.json: file-hash-abcdefabcdefabcdefabcdefabcdefabcdef
- node_modules/ environment:
- MY_VARIABLE=123
Command line options have precedence over the ones saved in '.resin-sync.yml'. Command line options have precedence over the ones saved in '.resin-sync.yml'.

2
lib/utils/ssh.ts
View File

@ -1,6 +1,6 @@
import { spawn } from 'child_process'; import { spawn } from 'child_process';
import * as Bluebird from 'bluebird'; import * as Bluebird from 'bluebird';
import TypedError = require('typed-error'); import { TypedError } from 'typed-error';
import { getSubShellCommand } from './helpers'; import { getSubShellCommand } from './helpers';

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "resin-cli", "name": "resin-cli",
"version": "7.8.4", "version": "7.8.5",
"description": "The official resin.io CLI tool", "description": "The official resin.io CLI tool",
"main": "./build/actions/index.js", "main": "./build/actions/index.js",
"homepage": "https://github.com/resin-io/resin-cli", "homepage": "https://github.com/resin-io/resin-cli",
@ -163,7 +163,7 @@
"tar-stream": "^1.5.5", "tar-stream": "^1.5.5",
"through2": "^2.0.3", "through2": "^2.0.3",
"tmp": "0.0.31", "tmp": "0.0.31",
"typed-error": "^2.0.0", "typed-error": "^3.0.0",
"umount": "^1.1.6", "umount": "^1.1.6",
"unzip2": "^0.2.5", "unzip2": "^0.2.5",
"update-notifier": "^2.2.0", "update-notifier": "^2.2.0",