armbian: fix build

Signed-off-by: nachoparker <nacho@ownyourbits.com>

3 files changed, 17 insertions, 15 deletions

diff --git a/batch.sh b/batch.sh
index 63cc5591..5ab1e996 100755
--- a/batch.sh
+++ b/batch.sh
@@ -48,7 +48,7 @@ export DOCKER_CLI_EXPERIMENTAL=enabled
 #&& {
   docker push ownyourbits/nextcloudpi-x86
   docker push ownyourbits/nextcloudpi-x86:${version}
-  docker push ownyourbits/nextcloud-x86 
+  docker push ownyourbits/nextcloud-x86
   docker push ownyourbits/nextcloud-x86 :${version}
   docker push ownyourbits/lamp-x86
   docker push ownyourbits/lamp-x86:${version}
diff --git a/build-docker.sh b/build-docker.sh
index 40fd70ce..dc6b1cae 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -21,7 +21,7 @@ function build_arch()
 
   docker_build -f docker/debian-ncp/Dockerfile  -t ownyourbits/debian-ncp-${ncp_tag}:latest --pull --build-arg release=${release} --build-arg arch=${arch} --build-arg arch_qemu=${arch_qemu}
   docker_build -f docker/lamp/Dockerfile        -t ownyourbits/lamp-${ncp_tag}:latest              --build-arg release=${release} --build-arg arch=${ncp_tag}
-  docker_build -f docker/nextcloud/Dockerfile   --no-cache -t ownyourbits/nextcloud-${ncp_tag}:latest         --build-arg release=${release} --build-arg arch=${ncp_tag}
+  docker_build -f docker/nextcloud/Dockerfile   -t ownyourbits/nextcloud-${ncp_tag}:latest         --build-arg release=${release} --build-arg arch=${ncp_tag}
   docker_build -f docker/nextcloudpi/Dockerfile -t ownyourbits/nextcloudpi-${ncp_tag}:latest       --build-arg release=${release} --build-arg arch=${ncp_tag} --build-arg ncp_ver=${version}
 
   docker tag ownyourbits/debian-ncp-${ncp_tag}:latest ownyourbits/debian-ncp-${ncp_tag}:"${version}"
diff --git a/update.sh b/update.sh
index 76c02c0b..75103b90 100755
--- a/update.sh
+++ b/update.sh
@@ -77,16 +77,6 @@ find etc -maxdepth 1 -type f ! -path etc/ncp.cfg -exec cp '{}' /usr/local/etc \;
 EOF
 cp -n etc/ncp.cfg /usr/local/etc
 
-# update NCVER in ncp.cfg and nc-nextcloud.cfg (for nc-autoupdate-nc and nc-update-nextcloud)
-nc_version=$(jq -r .nextcloud_version < etc/ncp.cfg)
-cfg="$(jq '.' /usr/local/etc/ncp.cfg)"
-cfg="$(jq ".nextcloud_version = \"$nc_version\"" <<<"$cfg")"
-echo "$cfg" > /usr/local/etc/ncp.cfg
-
-cfg="$(jq '.' etc/ncp-config.d/nc-nextcloud.cfg)"
-cfg="$(jq ".params[0].value = \"$nc_version\"" <<<"$cfg")"
-echo "$cfg" > /usr/local/etc/ncp-config.d/nc-nextcloud.cfg
-
 # install new entries of ncp-config and update others
 for file in etc/ncp-config.d/*; do
   [ -f "$file" ] || continue;    # skip dirs
@@ -119,6 +109,16 @@ for file in etc/ncp-config.d/*; do
 
 done
 
+# update NCVER in ncp.cfg and nc-nextcloud.cfg (for nc-autoupdate-nc and nc-update-nextcloud)
+nc_version=$(jq -r .nextcloud_version < etc/ncp.cfg)
+cfg="$(jq '.' /usr/local/etc/ncp.cfg)"
+cfg="$(jq ".nextcloud_version = \"$nc_version\"" <<<"$cfg")"
+echo "$cfg" > /usr/local/etc/ncp.cfg
+
+cfg="$(jq '.' etc/ncp-config.d/nc-nextcloud.cfg)"
+cfg="$(jq ".params[0].value = \"$nc_version\"" <<<"$cfg")"
+echo "$cfg" > /usr/local/etc/ncp-config.d/nc-nextcloud.cfg
+
 # install localization files
 cp -rT etc/ncp-config.d/l10n "$CONFDIR"/l10n
 
@@ -141,7 +141,6 @@ rm -rf /var/www/nextcloud/apps/nextcloudpi
 cp -r /var/www/ncp-app /var/www/nextcloud/apps/nextcloudpi
 chown -R www-data:     /var/www/nextcloud/apps/nextcloudpi
 
-
 [[ -f /.docker-image ]] && {
   # remove unwanted ncp-apps for the docker version
   for opt in $EXCL_DOCKER; do
@@ -153,8 +152,11 @@ chown -R www-data:     /var/www/nextcloud/apps/nextcloudpi
   cp docker/{lamp/010lamp,nextcloud/020nextcloud,nextcloudpi/000ncp} /etc/services-enabled.d
 }
 
-# update old images, only live updates
-[[ ! -f /.ncp-image ]] && ./run_update_history.sh "$UPDATESDIR"
+# only live updates from here
+[[ -f /.ncp-image ]] && exit 0
+
+# update old images
+./run_update_history.sh "$UPDATESDIR"
 
 # update to the latest NC version
 is_active_app nc-autoupdate-nc && run_app nc-autoupdate-nc