Merge pull request #334 from plietar/version

Add a version command.
This commit is contained in:
rhy-jot committed 2013-11-20 16:46:45 -08:00
commit dfcc46b1d2
2 files changed
+16 -2

No files matched your search

+8 -2
View File
@@ -1,20 +1,26 @@
DOKKU_VERSION = master
SSHCOMMAND_URL ?= https://raw.github.com/progrium/sshcommand/master/sshcommand SSHCOMMAND_URL ?= https://raw.github.com/progrium/sshcommand/master/sshcommand
PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_amd64.deb PLUGINHOOK_URL ?= https://s3.amazonaws.com/progrium-pluginhook/pluginhook_0.1.0_amd64.deb
STACK_URL ?= github.com/progrium/buildstep STACK_URL ?= github.com/progrium/buildstep
PREBUILT_STACK_URL ?= https://s3.amazonaws.com/progrium-dokku/progrium_buildstep_79cf6805cf.tgz PREBUILT_STACK_URL ?= https://s3.amazonaws.com/progrium-dokku/progrium_buildstep_79cf6805cf.tgz
DOKKU_ROOT ?= /home/dokku
.PHONY: all install copyfiles plugins dependencies sshcommand pluginhook docker aufs stack count .PHONY: all install copyfiles version plugins dependencies sshcommand pluginhook docker aufs stack count
all: all:
# Type "make install" to install. # Type "make install" to install.
install: dependencies stack copyfiles plugins install: dependencies stack copyfiles plugins version
copyfiles: copyfiles:
cp dokku /usr/local/bin/dokku cp dokku /usr/local/bin/dokku
mkdir -p /var/lib/dokku/plugins mkdir -p /var/lib/dokku/plugins
cp -r plugins/* /var/lib/dokku/plugins cp -r plugins/* /var/lib/dokku/plugins
version:
git describe --tags > ${DOKKU_ROOT}/VERSION 2> /dev/null || echo '~${DOKKU_VERSION} ($(shell date -uIminutes))' > ${DOKKU_ROOT}/VERSION
plugins: pluginhook docker plugins: pluginhook docker
dokku plugins-install dokku plugins-install
+8
View File
@@ -66,12 +66,20 @@ case "$1" in
fi fi
;; ;;
version)
cat "$DOKKU_ROOT/VERSION" || {
echo "Unable to determine dokku's version" 2>&1
exit 1
}
;;
help) help)
cat && cat<<EOF cat && cat<<EOF
delete <app> Delete an application delete <app> Delete an application
logs <app> [-t] Show the last logs for an application (-t follows) logs <app> [-t] Show the last logs for an application (-t follows)
run <app> <cmd> Run a command in the environment of an application run <app> <cmd> Run a command in the environment of an application
url <app> Show the URL for an application url <app> Show the URL for an application
version Print dokku's version
EOF EOF
;; ;;