Merge pull request #41 from nupplaphil/autobuild

Autobuild

.bashbrew/flags

@@ -0,0 +1 @@
+Namespace: friendica

.travis.yml

@@ -13,6 +13,9 @@ stages:
 # full test for master
   - name: test images (full)
     if: branch = master
+# build and push for master
+  - name: deploy
+    if: branch = master
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
@@ -83,3 +86,10 @@ jobs:
     - env: VERSION=2018.12-rc VARIANT=fpm ARCH=i386
     - env: VERSION=2018.12-rc VARIANT=apache ARCH=amd64
     - env: VERSION=2018.12-rc VARIANT=apache ARCH=i386
+
+    - stage: deploy
+      env: SCRIPT=build_and_push.sh
+      script: skip
+      deploy:
+        provider: script
+        script: ./build_and_push.sh

build_and_push.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+./generate-stackbrew-library.sh > server
+bashbrew --config .bashbrew/ --library ./ build server
+bashbrew --config .bashbrew/ --library ./ push server

generate-stackbrew-library.sh

@@ -12,7 +12,13 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 # Get the most recent commit which modified any of "$@".
 fileCommit() {
-	git log -1 --format='format:%H' HEAD -- "$@"
+	commit="$(git log -1 --format='format:%H' HEAD -- "$@")"
+	if [ -z "$commit" ]; then
+		# return some valid sha1 hash to make bashbrew happy
+		echo '0000000000000000000000000000000000000000'
+	else
+		echo "$commit"
+	fi
 }
 
 # Get the most recent commit which modified "$1/Dockerfile" or any file that
@@ -50,6 +56,7 @@ getArches 'friendica'
 # Header.
 cat <<-EOH
 # This file is generated via https://github.com/friendica/docker/blob/$(fileCommit "$self")/$self
+
 Maintainers: Friendica <info@friendi.ca> (@friendica), Philipp Holzer <admin@philipp.info> (@nupplaphil)
 GitRepo: https://github.com/friendica/docker.git
 EOH