Merge pull request #56 from dokku/master

Release 0.11.0
dokku · May 6, 2020 · ba9a901 · ba9a901
2 parents f73c63f + 509b021
commit ba9a901
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,13 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+## [0.11.0] - 2020-05-06
+
+### Changed
+
+- @josegonzalez Avoid writing acl-add key to temporary file
+- @josegonzalez Release packages for focal
+
 ## [0.10.0] - 2020-04-03
 
 ### Added
@@ -134,7 +141,8 @@ All notable changes to this project will be documented in this file.
 - @michaelshobbs update build image in README
 - @jvanbaarsen Only add SSH key if it doesn't already exists
 
-[unreleased]: https://github.com/dokku/sshcommand/compare/v0.10.0...HEAD
+[unreleased]: https://github.com/dokku/sshcommand/compare/v0.11.0...HEAD
+[0.11.0]: https://github.com/dokku/sshcommand/compare/v0.10.0...v0.11.0
 [0.10.0]: https://github.com/dokku/sshcommand/compare/v0.9.0...v0.10.0
 [0.9.0]: https://github.com/dokku/sshcommand/compare/v0.8.0...v0.9.0
 [0.8.0]: https://github.com/dokku/sshcommand/compare/v0.7.0...v0.8.0

diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ MAINTAINER_NAME = Jose Diaz-Gonzalez
 REPOSITORY = sshcommand
 HARDWARE = $(shell uname -m)
 SYSTEM_NAME  = $(shell uname -s | tr '[:upper:]' '[:lower:]')
-BASE_VERSION ?= 0.10.0
+BASE_VERSION ?= 0.11.0
 IMAGE_NAME ?= $(MAINTAINER)/$(REPOSITORY)
 PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish
 
@@ -146,6 +146,7 @@ release-packagecloud:
 release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb
 	package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/xenial  build/deb/$(NAME)_$(VERSION)_amd64.deb
 	package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic  build/deb/$(NAME)_$(VERSION)_amd64.deb
+	package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal  build/deb/$(NAME)_$(VERSION)_amd64.deb
 	package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_amd64.deb
 	package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster  build/deb/$(NAME)_$(VERSION)_amd64.deb
 

diff --git a/README.md b/README.md
@@ -39,6 +39,11 @@ If the public key is already on the server, you may also specify it as an argume
 
     $ ssh root@server sshcommand acl-add cmd progrium ~/.ssh/id_rsa.pub
 
+By default, key names and fingerprints must be unique. Both of these checks can be disabled by setting the following environment variables to `false`:
+
+    export SSHCOMMAND_CHECK_DUPLICATE_FINGERPRINT="false"
+    export SSHCOMMAND_CHECK_DUPLICATE_NAME="false"
+
 Now anywhere with the private key you can easily run:
 
     $ ssh cmd@server

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sshcommand",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Turn SSH into a thin client specifically for your app",
   "global": "true",
   "install": "cp sshcommand /usr/local/bin && chmod +x /usr/local/bin/sshcommand",

diff --git a/sshcommand b/sshcommand
@@ -137,9 +137,7 @@ sshcommand-acl-add() {
   fi
 
   if [[ -z "$KEY_FILE" ]]; then
-    KEY_FILE=$(mktemp)
-    KEY=$(tee "$KEY_FILE")
-    trap 'rm -f "$KEY_FILE"' INT EXIT
+    KEY=$(cat)
   else
     KEY=$(cat "$KEY_FILE")
   fi