From 7bddd8751e7d1807f66c9d695a3bc132ddeeb948 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 2 Apr 2016 22:20:26 -0400 Subject: [PATCH 1/3] Use released sshcommand This is what we actually give users who install via the preferred method, and thus we shouldn't be running tests from master. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a3713345c..f87a0baec 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DOKKU_VERSION = master -SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/master/sshcommand +SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.1.0/sshcommand PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.1/plugn_0.2.1_linux_x86_64.tgz SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz STACK_URL ?= https://github.com/gliderlabs/herokuish.git From 858240874c8f1740db4afed0f53b928ef083b624 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 2 Apr 2016 22:20:39 -0400 Subject: [PATCH 2/3] Update packaging to use released sshcommand version --- deb.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deb.mk b/deb.mk index 464956c58..86c968674 100644 --- a/deb.mk +++ b/deb.mk @@ -20,6 +20,7 @@ SSHCOMMAND_REPO_NAME ?= dokku/sshcommand SSHCOMMAND_VERSION ?= 0.1.0 SSHCOMMAND_ARCHITECTURE = amd64 SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb +SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v$(SSHCOMMAND_VERSION)/sshcommand SIGIL_DESCRIPTION = 'Standalone string interpolator and template processor' SIGIL_REPO_NAME ?= gliderlabs/sigil @@ -124,17 +125,16 @@ deb-plugn: deb-setup sudo fpm -t deb -s dir -C /tmp/build -n plugn -v $(PLUGN_VERSION) -a $(PLUGN_ARCHITECTURE) -p $(PLUGN_PACKAGE_NAME) --url "https://github.com/$(PLUGN_REPO_NAME)" --description $(PLUGN_DESCRIPTION) --license 'MIT License' . mv *.deb /tmp -deb-sshcommand: deb-setup +deb-sshcommand: rm -rf /tmp/tmp /tmp/build $(SSHCOMMAND_PACKAGE_NAME) mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/local/bin - @echo "-> Cloning repository" - git clone -q "https://github.com/$(SSHCOMMAND_REPO_NAME).git" /tmp/tmp/sshcommand > /dev/null - rm -rf /tmp/tmp/sshcommand/.git /tmp/tmp/sshcommand/.gitignore + @echo "-> Downloading package" + wget -q -O /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) $(SSHCOMMAND_URL) @echo "-> Copying files into place" mkdir -p "/tmp/build/usr/local/bin" - cp /tmp/tmp/sshcommand/sshcommand /tmp/build/usr/local/bin/sshcommand + cp /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) /tmp/build/usr/local/bin/sshcommand chmod +x /tmp/build/usr/local/bin/sshcommand @echo "-> Creating $(SSHCOMMAND_PACKAGE_NAME)" From bbf310147e7589ea893deb18ce42d70c1f5a8aa7 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 2 Apr 2016 22:22:50 -0400 Subject: [PATCH 3/3] Upgrade sshcommand to 0.2.0 --- Makefile | 2 +- deb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f87a0baec..8de114047 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DOKKU_VERSION = master -SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.1.0/sshcommand +SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.2.0/sshcommand PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v0.2.1/plugn_0.2.1_linux_x86_64.tgz SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz STACK_URL ?= https://github.com/gliderlabs/herokuish.git diff --git a/deb.mk b/deb.mk index 86c968674..7e805c3bc 100644 --- a/deb.mk +++ b/deb.mk @@ -17,7 +17,7 @@ PLUGN_URL = https://github.com/dokku/plugn/releases/download/v$(PLUGN_VERSION)/p SSHCOMMAND_DESCRIPTION = 'Turn SSH into a thin client specifically for your app' SSHCOMMAND_REPO_NAME ?= dokku/sshcommand -SSHCOMMAND_VERSION ?= 0.1.0 +SSHCOMMAND_VERSION ?= 0.2.0 SSHCOMMAND_ARCHITECTURE = amd64 SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v$(SSHCOMMAND_VERSION)/sshcommand