From c66e08041ae10fa983247cede1efdeb0ed839842 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Aug 2019 19:31:39 -0400 Subject: [PATCH] refactor: refer to upstream sshcommand package sshcommand now packages itself. --- Makefile | 7 +++--- contrib/build-dokku.Dockerfile | 4 ++-- deb.mk | 40 ++-------------------------------- rpm.mk | 26 +--------------------- tests/ci/setup.sh | 2 +- 5 files changed, 10 insertions(+), 69 deletions(-) diff --git a/Makefile b/Makefile index 967e9ef90..eaed9af2d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,8 @@ DOKKU_VERSION ?= master PROCFILE_VERSION ?= 0.6.0 PLUGN_VERSION ?= 0.3.2 -SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/v0.7.0/sshcommand +SSHCOMMAND_VERSION ?= 0.8.0 +SSHCOMMAND_URL ?= https://github.com/dokku/sshcommand/releases/download/v${SSHCOMMAND_VERSION}/sshcommand_${SSHCOMMAND_VERSION}_linux_x86_64.tgz PROCFILE_UTIL_URL ?= https://github.com/josegonzalez/go-procfile-util/releases/download/v${PROCFILE_VERSION}/procfile-util_${PROCFILE_VERSION}_linux_x86_64.tgz PLUGN_URL ?= https://github.com/dokku/plugn/releases/download/v${PLUGN_VERSION}/plugn_${PLUGN_VERSION}_linux_x86_64.tgz SIGIL_URL ?= https://github.com/gliderlabs/sigil/releases/download/v0.4.0/sigil_0.4.0_Linux_x86_64.tgz @@ -135,8 +136,8 @@ man-db: apt-get install -qq -y man-db sshcommand: - wget -qO /usr/local/bin/sshcommand ${SSHCOMMAND_URL} - chmod +x /usr/local/bin/sshcommand + wget -qO /tmp/procfile-util_latest.tgz ${SSHCOMMAND_URL} + tar xzf /tmp/procfile-util_latest.tgz -C /usr/local/bin sshcommand create dokku /usr/local/bin/dokku procfile-util: diff --git a/contrib/build-dokku.Dockerfile b/contrib/build-dokku.Dockerfile index de3906b38..9ab782f6a 100644 --- a/contrib/build-dokku.Dockerfile +++ b/contrib/build-dokku.Dockerfile @@ -36,7 +36,7 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \ SKIP_GO_CLEAN=true \ make version copyfiles \ && rm -rf plugins/common/*.go plugins/common/glide* plugins/common/vendor/ \ - && make deb-dokku deb-sshcommand deb-sigil \ - rpm-dokku rpm-sshcommand rpm-sigil + && make deb-dokku deb-sigil \ + rpm-dokku rpm-sigil RUN ls -lha /tmp/ diff --git a/deb.mk b/deb.mk index b34038111..9101c3758 100644 --- a/deb.mk +++ b/deb.mk @@ -16,17 +16,6 @@ DOKKU_UPDATE_VERSION ?= 0.1.0 DOKKU_UPDATE_ARCHITECTURE = amd64 DOKKU_UPDATE_PACKAGE_NAME = dokku-update_$(DOKKU_UPDATE_VERSION)_$(DOKKU_UPDATE_ARCHITECTURE).deb -define SSHCOMMAND_DESCRIPTION -Turn SSH into a thin client specifically for your app -Simplifies running a single command over SSH, and -manages authorized keys (ACL) and users in order to do so. -endef -SSHCOMMAND_REPO_NAME ?= dokku/sshcommand -SSHCOMMAND_VERSION ?= 0.7.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 - define SIGIL_DESCRIPTION Standalone string interpolator and template processor Sigil is a command line tool for template processing @@ -45,9 +34,8 @@ ifndef IS_RELEASE endif export SIGIL_DESCRIPTION -export SSHCOMMAND_DESCRIPTION -.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-dokku-update deb-setup deb-sshcommand deb-sigil +.PHONY: install-from-deb deb-all deb-herokuish deb-dokku deb-dokku-update deb-setup deb-sigil install-from-deb: @echo "--> Initial apt-get update" @@ -63,7 +51,7 @@ install-from-deb: sudo apt-get update -qq >/dev/null sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -yy dokku -deb-all: deb-setup deb-herokuish deb-dokku deb-sshcommand deb-sigil deb-dokku-update +deb-all: deb-setup deb-herokuish deb-dokku deb-sigil deb-dokku-update mv $(BUILD_DIRECTORY)/*.deb . @echo "Done" @@ -129,30 +117,6 @@ deb-dokku-update: contrib/dokku-update=/usr/local/bin/dokku-update \ contrib/dokku-update-version=/var/lib/dokku-update/VERSION -deb-sshcommand: - rm -rf /tmp/tmp /tmp/build $(SSHCOMMAND_PACKAGE_NAME) - mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/local/bin - - @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_VERSION) /tmp/build/usr/local/bin/sshcommand - chmod +x /tmp/build/usr/local/bin/sshcommand - - @echo "-> Creating $(SSHCOMMAND_PACKAGE_NAME)" - sudo fpm -t deb -s dir -C /tmp/build -n sshcommand \ - --version $(SSHCOMMAND_VERSION) \ - --architecture $(SSHCOMMAND_ARCHITECTURE) \ - --package $(BUILD_DIRECTORY)/$(SSHCOMMAND_PACKAGE_NAME) \ - --url "https://github.com/$(SSHCOMMAND_REPO_NAME)" \ - --maintainer "Jose Diaz-Gonzalez " \ - --category admin \ - --description "$$SSHCOMMAND_DESCRIPTION" \ - --license 'MIT License' \ - . - deb-sigil: rm -rf /tmp/tmp /tmp/build $(SIGIL_PACKAGE_NAME) mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin diff --git a/rpm.mk b/rpm.mk index 6e9f740aa..ccc0ca9af 100644 --- a/rpm.mk +++ b/rpm.mk @@ -2,12 +2,11 @@ RPM_ARCHITECTURE = x86_64 DOKKU_RPM_PACKAGE_NAME = dokku-$(DOKKU_VERSION)-1.$(RPM_ARCHITECTURE).rpm DOKKU_UPDATE_RPM_PACKAGE_NAME = dokku-update-$(DOKKU_UPDATE_VERSION)-1.$(RPM_ARCHITECTURE).rpm HEROKUISH_RPM_PACKAGE_NAME = herokuish-$(HEROKUISH_VERSION)-1.$(RPM_ARCHITECTURE).rpm -SSHCOMMAND_RPM_PACKAGE_NAME = sshcommand-$(SSHCOMMAND_VERSION)-1.$(RPM_ARCHITECTURE).rpm SIGIL_RPM_PACKAGE_NAME = gliderlabs-sigil-$(SIGIL_VERSION)-1.$(RPM_ARCHITECTURE).rpm .PHONY: rpm-all -rpm-all: rpm-setup rpm-herokuish rpm-dokku rpm-sshcommand rpm-sigil rpm-dokku-update +rpm-all: rpm-setup rpm-herokuish rpm-dokku rpm-sigil rpm-dokku-update mv /tmp/*.rpm . @echo "Done" @@ -94,29 +93,6 @@ rpm-dokku-update: contrib/dokku-update=/usr/local/bin/dokku-update \ contrib/dokku-update-version=/var/lib/dokku-update/VERSION -rpm-sshcommand: - rm -rf /tmp/tmp /tmp/build $(BUILD_DIRECTORY)/$(SSHCOMMAND_RPM_PACKAGE_NAME) - mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin - - @echo "-> Downloading package" - wget -q -O /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) $(SSHCOMMAND_URL) - - @echo "-> Copying files into place" - mkdir -p "/tmp/build/usr/bin" - cp /tmp/tmp/sshcommand-$(SSHCOMMAND_VERSION) /tmp/build/usr/bin/sshcommand - chmod +x /tmp/build/usr/bin/sshcommand - - @echo "-> Creating $(SSHCOMMAND_RPM_PACKAGE_NAME)" - sudo fpm -t rpm -s dir -C /tmp/build -n sshcommand \ - --version $(SSHCOMMAND_VERSION) \ - --architecture $(RPM_ARCHITECTURE) \ - --package $(BUILD_DIRECTORY)/$(SSHCOMMAND_RPM_PACKAGE_NAME) \ - --url "https://github.com/$(SSHCOMMAND_REPO_NAME)" \ - --category admin \ - --description "$$SSHCOMMAND_DESCRIPTION" \ - --license 'MIT License' \ - . - rpm-sigil: rm -rf /tmp/tmp /tmp/build $(BUILD_DIRECTORY)/$(SIGIL_RPM_PACKAGE_NAME) mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin diff --git a/tests/ci/setup.sh b/tests/ci/setup.sh index 0ebe43714..01951d58d 100755 --- a/tests/ci/setup.sh +++ b/tests/ci/setup.sh @@ -15,7 +15,7 @@ install_dependencies() { PLUGN_PACKAGE_NAME="plugn_${PLUGN_VERSION}_amd64.deb" curl -L "https://packagecloud.io/dokku/dokku/packages/ubuntu/trusty/plugn_${PLUGN_VERSION}_amd64.deb/download.deb" -o "$ROOT_DIR/build/${PLUGN_PACKAGE_NAME}" - SSHCOMMAND_VERSION=$(grep SSHCOMMAND_VERSION "${ROOT_DIR}/deb.mk" | head -n1 | cut -d' ' -f3) + SSHCOMMAND_VERSION=$(grep SSHCOMMAND_VERSION "${ROOT_DIR}/Makefile" | head -n1 | cut -d' ' -f3) SSHCOMMAND_PACKAGE_NAME="sshcommand_${SSHCOMMAND_VERSION}_amd64.deb" curl -L "https://packagecloud.io/dokku/dokku/packages/ubuntu/trusty/sshcommand_${SSHCOMMAND_VERSION}_amd64.deb/download.deb" -o "$ROOT_DIR/build/${SSHCOMMAND_PACKAGE_NAME}"