From 616908ad53a45d1f372ba3f905d4badef0d8f2e2 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 17 Sep 2018 18:19:29 +0200 Subject: [PATCH 1/2] use a dummy database name for the default postgres database name For some reason the docker image does not setup the permissions correctly, by using a different name the nextcloud installer will create the database instead with the correct permissions Signed-off-by: Robin Appelman --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e90713b285b..eb301c18a48 100644 --- a/.drone.yml +++ b/.drone.yml @@ -197,7 +197,7 @@ pipeline: image: nextcloudci/php5.6:php5.6-8 commands: - sleep 10 # gives the database enough time to initialize - - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql + - POSTGRES=${POSTGRES} NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh pgsql when: matrix: DB: postgres @@ -649,6 +649,7 @@ services: image: postgres:9 environment: - POSTGRES_USER=oc_autotest + - POSTGRES_DB=oc_autotest_dummy - POSTGRES_PASSWORD=owncloud tmpfs: - /var/lib/postgresql/data From 9e28fb8a3dcd7741d088cab3e1c4ff0593913651 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 3 Oct 2018 15:12:36 +0200 Subject: [PATCH 2/2] 12.0.12 RC 1 Signed-off-by: Morris Jobke --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index cf69f07b035..c7df9be4ae4 100644 --- a/version.php +++ b/version.php @@ -26,10 +26,10 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(12, 0, 11, 1); +$OC_Version = array(12, 0, 12, 0); // The human readable string -$OC_VersionString = '12.0.11'; +$OC_VersionString = '12.0.12 RC 1'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [