build: batch creation of all images and containers

6 files changed, 90 insertions, 6 deletions

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..23760651
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+torrent/
+partial/
+qemu-raspbian-network/
+armbian/
+*.img
+*.tar.bz2
diff --git a/.gitignore b/.gitignore
index 5abd024f..75fe7a59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.bz2
 qemu-raspbian-network/
 torrent/
+armbian/
diff --git a/README.md b/README.md
index 5266a0e4..829e1fcd 100644
--- a/README.md
+++ b/README.md
@@ -110,4 +110,6 @@ Pull the docker image
 
 https://ownyourbits.com/2017/06/08/nextcloudpi-docker-for-raspberry-pi/
 
-https://hub.docker.com/r/ownyourbits/nextcloudpi/
+https://hub.docker.com/r/ownyourbits/nextcloudpi-x86
+
+https://hub.docker.com/r/ownyourbits/nextcloudpi-armhf
diff --git a/batch.sh b/batch.sh
new file mode 100755
index 00000000..b924c082
--- /dev/null
+++ b/batch.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+# Batch creation of NextCloudPi images and containers
+#
+# Copyleft 2017 by Ignacio Nunez Hernanz <nacho _a_t_ ownyourbits _d_o_t_ com>
+# GPL licensed (see end of file) * Use at your own risk!
+#
+# Usage: ./batch.sh <DHCP QEMU image IP>
+#
+
+source buildlib.sh          # initializes $IMGNAME
+
+IP=$1                       # First argument is the QEMU Raspbian IP address
+
+
+## BUILDING
+
+# Raspbian
+./build-SD.sh "$IP"
+
+# docker x86
+docker pull debian:stretch-slim
+make nextcloudpi-x86 && {
+  docker push ownyourbits/nextcloudpi-x86 
+  docker push ownyourbits/nextcloud-x86 
+  docker push ownyourbits/lamp-x86
+  docker push ownyourbits/debian-ncp-x86
+}
+
+# docker armhf
+[[ -f docker-armhf/raspbian_docker.img ]] || \
+  ./installer.sh docker-armhf/docker-env.sh "$IP" raspbian_lite.img # && mv
+./installer.sh docker-armhf/build-container.sh "$IP" docker-armhf/raspbian_docker.img
+
+# Armbian
+git clone https://github.com/armbian/build armbian
+wget https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/armbian.sh \
+  -O armbian/userpatches/customize-image.sh
+armbian/compile.sh docker \
+  BOARD=odroidxu4\
+  BRANCH=next\
+  KERNEL_ONLY=no\
+  KERNEL_CONFIGURE=no\
+  RELEASE=stretch\
+  BUILD_DESKTOP=no\
+  CLEAN_LEVEL=""\
+  NO_APT_CACHER=no
+
+# License
+#
+# This script is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This script is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this script; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+# Boston, MA  02111-1307  USA
diff --git a/changelog.md b/changelog.md
index 38eba951..a579d1ed 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,9 +1,13 @@
 
-[v0.37.0 ](https://github.com/nextcloud/nextcloudpi/commit/fd5f04e) (2017-11-19) added nc-info
+[v0.37.2 ](https://github.com/nextcloud/nextcloudpi/commit/529f9de) (2017-11-20) nc-datadir: dont create dir if not exists
+
+[v0.37.1 ](https://github.com/nextcloud/nextcloudpi/commit/a97bc07) (2017-11-19) nc-restore: fix restore passwod
+
+[v0.37.0 ](https://github.com/nextcloud/nextcloudpi/commit/1563373) (2017-11-19) added nc-info
 
 [v0.36.2 ](https://github.com/nextcloud/nextcloudpi/commit/52ada6a) (2017-11-19) nc-diag: small fixes
 
-[v0.36.1, master](https://github.com/nextcloud/nextcloudpi/commit/eadfd72) (2017-11-18) update: fix return value
+[v0.36.1 ](https://github.com/nextcloud/nextcloudpi/commit/eadfd72) (2017-11-18) update: fix return value
 
 [v0.36.0 ](https://github.com/nextcloud/nextcloudpi/commit/43813d6) (2017-11-18) added ncp-diag and ncp-report
 
diff --git a/docker-armhf/build-container.sh b/docker-armhf/build-container.sh
index 7080ae0b..d7d0eed3 100644
--- a/docker-armhf/build-container.sh
+++ b/docker-armhf/build-container.sh
@@ -11,9 +11,16 @@
 
 install()
 {
-  git clone https://github.com/nextcloud/nextcloudpi.git
-  make -C nextcloudpi
-  # TODO docker push 
+  [[ -d nextcloudpi ]] || git clone --depth 1 https://github.com/nextcloud/nextcloudpi.git
+  cd nextcloudpi
+  git pull origin master
+  docker pull arm32v7/debian:stretch-slim
+  make && {
+    docker push ownyourbits/nextcloudpi-armhf 
+    docker push ownyourbits/nextcloud-armhf 
+    docker push ownyourbits/lamp-armhf
+    docker push ownyourbits/debian-ncp-armhf
+  }
 }
 
 configure(){ :; }