Merge pull request #54 from nextcloud/prepare-13.0.3

Prepare 13.0.3

Dockerfile

@@ -21,7 +21,7 @@
 
 FROM ubuntu:16.04
 
-ADD https://download.nextcloud.com/server/prereleases/nextcloud-13.0.2.tar.bz2 /root/nextcloud.tar.bz2
+ADD https://download.nextcloud.com/server/prereleases/nextcloud-13.0.3.tar.bz2 /root/nextcloud.tar.bz2
 COPY resources/entrypoint.sh /usr/sbin/
 COPY resources/60-nextcloud.ini /etc/php/7.0/apache2/conf.d/
 COPY resources/60-nextcloud.ini /etc/php/7.0/cli/conf.d/

Makefile

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 app_name=nextcloud
-app_version=13.0.2-0
+app_version=13.0.3-0
 
 ucs_version=4.1
 
@@ -52,11 +52,9 @@ push-files:
 		i18n/en/README_UNINSTALL_EN \
 		i18n/de/README_UNINSTALL_DE
 	univention-appcenter-control set --noninteractive $(app_name)=$(app_version) \
-		--json '{"DockerImage": "nextcloud/univention-app-image:$(app_version)"}'
+		--json '{"DockerImage": "nextcloud/univention-app:$(app_version)"}'
 
 .PHONY: docker
 docker:
 	if [ `systemctl is-active docker` = "inactive" ] ; then sudo systemctl start docker; fi
-	sudo docker build -t $(docker_repo)/univention-app-image:$(app_version) .
-	sudo docker login -u $(docker_login) -p $(docker_pwd)
-	sudo docker push $(docker_repo)/univention-app-image:$(app_version)
+	sudo docker build -t $(docker_repo)/univention-app:$(app_version) .

README.md

@@ -207,17 +207,21 @@ Uploads go against the current Nextcloud app version as configured in the Makefi
 
 ### Create and upload docker image
 
+to create a local build use
+
 $ make docker
 
-assumes that account credentials are stored in ``~/.docker-account-user`` and ``~/.docker-account-pwd``.
+in order to trigger a build on the docker hub tag it like
+
+$ git tag "13.0.3-0"
 
-The only downside is that it needs to ask for the password, because of using sudo for the docker commands. No, we do not encourage adding users to the docker group.
+and push.
 
 ### Prepare release
 
-$ make
+Tag the latest commit with the package name, e.g. `13.0.3-0` and push the tags. An automated build is configured at the docker hub.
 
-This is essentially ``make push-files && make docker``
+$ make push-files
 
 Afterwards, there are still two things that need to be done in the Provider Portal:
 

inst

@@ -184,7 +184,7 @@ nextcloud_add_Administrator_to_admin_group() {
     if [ ! $STATUS -eq 1 ] ; then
         echo "Could not add Administrator to admin group, because user was not found:"
         echo $RESULT
-        die
+        return
     fi
 
     RESULT=`nextcloud_curl -X POST -d "groupid=admin" -H "OCS-APIREQUEST: true" -u "nc_admin:$NC_ADMIN_PWD" $NC_ADDITIONAL_CURL_ARGS \
@@ -194,7 +194,7 @@ nextcloud_add_Administrator_to_admin_group() {
     if [ ! $STATUS -eq 1 ] ; then
         echo "Could not add Administrator to admin group, because adding as group member failed:"
         echo $RESULT
-        die
+        return
     fi
 }