From 251449d653b64436294d79930c55d80ed7a38697 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 4 Jun 2018 16:09:42 +0200 Subject: [PATCH 1/6] promoting the LDAP Administrator to Nextcloud admin may fail, fixes #53 Signed-off-by: Arthur Schiwon --- inst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inst b/inst index d1cff9e..d589371 100644 --- a/inst +++ b/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 } From d3a88964d9aeb650e4b4f0887098f1cc432cb9eb Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 4 Jun 2018 16:12:36 +0200 Subject: [PATCH 2/6] prepare 13.0.3 Signed-off-by: Arthur Schiwon --- Dockerfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a30f93c..2d79c8c 100644 --- a/Dockerfile +++ b/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.3RC2.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/ diff --git a/Makefile b/Makefile index 24f8718..df88ef6 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # along with this program. If not, see . app_name=nextcloud -app_version=13.0.2-0 +app_version=13.0.2-90 ucs_version=4.1 From b0719428747535203b265ca8a2816de5f3eeaed9 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 7 Jun 2018 11:57:22 +0200 Subject: [PATCH 3/6] final 13.0.3 Signed-off-by: Arthur Schiwon --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2d79c8c..cfeb224 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ FROM ubuntu:16.04 -ADD https://download.nextcloud.com/server/prereleases/nextcloud-13.0.3RC2.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/ From af2b075736af0e4a3105eeaed06f3b4113692fda Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 7 Jun 2018 12:04:21 +0200 Subject: [PATCH 4/6] and also adjust the version in the Makefile Signed-off-by: Arthur Schiwon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df88ef6..bd00360 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # along with this program. If not, see . app_name=nextcloud -app_version=13.0.2-90 +app_version=13.0.3-0 ucs_version=4.1 From f6741887ed42f4ff5488319bb1c69c55866d9674 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 7 Jun 2018 12:11:15 +0200 Subject: [PATCH 5/6] docker automated build was configured, adjust readme and makefile Signed-off-by: Arthur Schiwon --- Makefile | 2 -- README.md | 12 ++++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index bd00360..91c7db4 100644 --- a/Makefile +++ b/Makefile @@ -58,5 +58,3 @@ push-files: 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) diff --git a/README.md b/README.md index b8219a7..29f5ccc 100644 --- a/README.md +++ b/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: From 59fa57e31d6490d46388c9461d9c8e3c656004ac Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 7 Jun 2018 12:38:11 +0200 Subject: [PATCH 6/6] fix docker image name to match automated build Signed-off-by: Arthur Schiwon --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 91c7db4..96e3efd 100644 --- a/Makefile +++ b/Makefile @@ -52,9 +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 build -t $(docker_repo)/univention-app:$(app_version) .