Moved plugin build to system, upgraded to v0.12.5

2 files changed, 24 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fd454ab1d78b..925bce35e4df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,27 @@
 pkgbase = dokku
 	pkgdesc = Docker powered mini-Heroku in around 100 lines of Bash.
-	pkgver = 0.12.4
+	pkgver = 0.12.5
 	pkgrel = 1
 	url = https://github.com/dokku/dokku
 	install = dokku.install
 	arch = any
 	license = MIT
+	makedepends = go
 	makedepends = plugn
+	depends = bind-tools
 	depends = docker
-	depends = nginx
-	depends = plugn>=0.3.0
-	depends = sshcommand>=0.7.0
-	depends = herokuish>=0.4.0
-	depends = openbsd-netcat
 	depends = gliderlabs-sigil
+	depends = go
+	depends = herokuish>=0.4.0
 	depends = lsb-release
-	depends = bind-tools
+	depends = nginx
+	depends = openbsd-netcat
+	depends = plugn>=0.3.0
 	depends = python
-	source = https://github.com/dokku/dokku/archive/v0.12.4.zip
+	depends = sshcommand>=0.7.0
+	source = https://github.com/dokku/dokku/archive/v0.12.5.zip
 	source = dokku.install
-	sha256sums = d0691ce285c2e054c43ec09a6c76de0b1d22617059f8af3a8ed15817462665f6
+	sha256sums = 6d24045a6230acf4e707a89d65cd49565a712478c1bfeb1af1152fb774e9fdfb
 	sha256sums = 3d5a12c09fdc25dce99961ee33df0a0d22c26a53e6307eb52c4d728c46a36698
 
 pkgname = dokku
diff --git a/PKGBUILD b/PKGBUILD
index 3af7633e47d4..445a72b012d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,32 @@
 pkgname=dokku
-pkgver=0.12.4
+pkgver=0.12.5
 pkgrel=1
 pkgdesc="Docker powered mini-Heroku in around 100 lines of Bash."
 arch=(any)
 url="https://github.com/dokku/dokku"
 license=(MIT)
 makedepends=(
+  'go'
   'plugn'
 )
 depends=(
+  'bind-tools'
   'docker'
-  'nginx'
-  'plugn>=0.3.0'
-  'sshcommand>=0.7.0'
-  'herokuish>=0.4.0'
-  'openbsd-netcat'
   'gliderlabs-sigil'
+  'go'
+  'herokuish>=0.4.0'
   'lsb-release'
-  'bind-tools'
+  'nginx'
+  'openbsd-netcat'
+  'plugn>=0.3.0'
   'python'
+  'sshcommand>=0.7.0'
 )
-
 source=(
   "https://github.com/dokku/dokku/archive/v${pkgver}.zip"
   "${pkgname}.install"
 )
-sha256sums=('d0691ce285c2e054c43ec09a6c76de0b1d22617059f8af3a8ed15817462665f6'
+sha256sums=('6d24045a6230acf4e707a89d65cd49565a712478c1bfeb1af1152fb774e9fdfb'
             '3d5a12c09fdc25dce99961ee33df0a0d22c26a53e6307eb52c4d728c46a36698')
 install=${pkgname}.install
 
@@ -34,7 +35,9 @@ package() {
 
   install -Dm755 dokku "${pkgdir}/usr/bin/dokku"
 
-  make go-build
+  go get github.com/ryanuber/columnize
+  go get github.com/dokku/dokku/plugins/config
+  env PLUGIN_MAKE_TARGET=build make go-build
   mkdir -p "${pkgdir}/var/lib/dokku/core-plugins/available"
   cp common.mk "${pkgdir}/var/lib/dokku/core-plugins/common.mk"
   cp -r plugins/* "${pkgdir}/var/lib/dokku/core-plugins/available"