Merge pull request #2691 from dokku/packaging

Fix package building when golang binaries are available

Makefile

@@ -88,7 +88,9 @@ copyfiles:
 		PLUGIN_PATH=${CORE_PLUGINS_PATH} plugn enable $$plugin ;\
 		PLUGIN_PATH=${PLUGINS_PATH} plugn enable $$plugin ;\
 	done
+ifndef SKIP_GO_CLEAN
 	$(MAKE) go-clean
+endif
 	chown dokku:dokku -R ${PLUGINS_PATH} ${CORE_PLUGINS_PATH} || true
 	$(MAKE) addman
 

contrib/build.Dockerfile

@@ -32,6 +32,7 @@ RUN PATH=$PATH:/usr/local/go/bin GOPATH=/go \
     DOKKU_VERSION=${DOKKU_VERSION} \
     DOKKU_GIT_REV=${DOKKU_GIT_REV} \
     IS_RELEASE=${IS_RELEASE} \
+    SKIP_GO_CLEAN=true \
     make version copyfiles \
     && rm -rf plugins/common/*.go  plugins/common/glide*  plugins/common/vendor/ \
     && make deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil \

contrib/release

@@ -47,7 +47,7 @@ fn-build-dokku() {
     --build-arg DOKKU_VERSION="$DOKKU_VERSION" \
     --build-arg DOKKU_GIT_REV="$DOKKU_GIT_REV" \
     --build-arg IS_RELEASE="$IS_RELEASE" \
-    --build-arg PLUGIN_MAKE_TARGET="build src-clean" \
+    --build-arg PLUGIN_MAKE_TARGET="build" \
     --build-arg GOLANG_VERSION="$GOLANG_VERSION" \
     -f "contrib/build.Dockerfile" \
     -t "$NAME" .

deb.mk

@@ -124,8 +124,12 @@ deb-dokku:
 	cp dokku /tmp/build/usr/bin
 	cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
 	find . -name ".DS_Store" -depth -exec rm {} \;
+	$(MAKE) go-build
+	cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
 	cp -r plugins/* /tmp/build/var/lib/dokku/core-plugins/available
+	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd /tmp/build/var/lib/dokku/core-plugins/available/$$plugin && if [ -e Makefile ]; then $(MAKE) src-clean; fi; done
 	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/core-plugins/available/$$plugin/.core; done
+	rm /tmp/build/var/lib/dokku/core-plugins/common.mk
 	$(MAKE) help2man
 	$(MAKE) addman
 	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1

debian/lintian-overrides

@@ -1,3 +1,5 @@
 dokku: command-with-path-in-maintainer-script postinst:16 /usr/bin/sshcommand
 dokku: maintainer-script-calls-systemctl postinst:87
 dokku: changelog-file-missing-in-native-package
+dokku: statically-linked-binary
+dokku: unstripped-binary-or-object

plugins/repo/Makefile

@@ -23,4 +23,4 @@ clean:
 	rm -rf commands subcommands
 
 src-clean:
-	rm -rf .gitignore src vendor
+	rm -rf .gitignore src vendor Makefile

rpm.mk

@@ -58,8 +58,12 @@ rpm-dokku:
 	cp dokku /tmp/build/usr/bin
 	cp LICENSE /tmp/build/usr/share/doc/dokku/copyright
 	find . -name ".DS_Store" -depth -exec rm {} \;
+	$(MAKE) go-build
+	cp common.mk /tmp/build/var/lib/dokku/core-plugins/common.mk
 	cp -r plugins/* /tmp/build/var/lib/dokku/core-plugins/available
+	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do cd /tmp/build/var/lib/dokku/core-plugins/available/$$plugin && if [ -e Makefile ]; then $(MAKE) src-clean; fi; done
 	find plugins/ -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | while read plugin; do touch /tmp/build/var/lib/dokku/core-plugins/available/$$plugin/.core; done
+	rm /tmp/build/var/lib/dokku/core-plugins/common.mk
 	$(MAKE) help2man
 	$(MAKE) addman
 	cp /usr/local/share/man/man1/dokku.1 /tmp/build/usr/share/man/man1/dokku.1