From fbdb70e856554676a695f6bbb290ed55fc0edb62 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Mon, 13 Jan 2020 16:11:28 +0000
Subject: [PATCH] Remove workaround to create the postgres db (fix #886) (#961)
This reverts commit 4df6f795684fcfdb2b507f89a388e9ad9e6e081e.
The upstream bug has been fixed in https://github.com/nextcloud/server/pull/15187
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
---
.examples/docker-compose/insecure/postgres/apache/db.env | 3 ++-
.../docker-compose/insecure/postgres/apache/docker-compose.yml | 1 -
.examples/docker-compose/insecure/postgres/fpm/db.env | 3 ++-
.../docker-compose/insecure/postgres/fpm/docker-compose.yml | 1 -
.../docker-compose/with-nginx-proxy/postgres/apache/db.env | 3 ++-
.../with-nginx-proxy/postgres/apache/docker-compose.yml | 1 -
.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env | 3 ++-
.../with-nginx-proxy/postgres/fpm/docker-compose.yml | 1 -
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.examples/docker-compose/insecure/postgres/apache/db.env b/.examples/docker-compose/insecure/postgres/apache/db.env
index dd2a4610..41106cab 100644
--- a/.examples/docker-compose/insecure/postgres/apache/db.env
+++ b/.examples/docker-compose/insecure/postgres/apache/db.env
@@ -1,2 +1,3 @@
POSTGRES_PASSWORD=
-POSTGRES_USER=postgres
+POSTGRES_DB=nextcloud
+POSTGRES_USER=nextcloud
diff --git a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
index 159a17b1..596568d6 100644
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@@ -18,7 +18,6 @@ services:
- nextcloud:/var/www/html
environment:
- POSTGRES_HOST=db
- - POSTGRES_DB=nextcloud
env_file:
- db.env
depends_on:
diff --git a/.examples/docker-compose/insecure/postgres/fpm/db.env b/.examples/docker-compose/insecure/postgres/fpm/db.env
index dd2a4610..41106cab 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/db.env
+++ b/.examples/docker-compose/insecure/postgres/fpm/db.env
@@ -1,2 +1,3 @@
POSTGRES_PASSWORD=
-POSTGRES_USER=postgres
+POSTGRES_DB=nextcloud
+POSTGRES_USER=nextcloud
diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
index 113cf66d..b1ff459c 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@@ -16,7 +16,6 @@ services:
- nextcloud:/var/www/html
environment:
- POSTGRES_HOST=db
- - POSTGRES_DB=nextcloud
env_file:
- db.env
depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env b/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env
index dd2a4610..41106cab 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/db.env
@@ -1,2 +1,3 @@
POSTGRES_PASSWORD=
-POSTGRES_USER=postgres
+POSTGRES_DB=nextcloud
+POSTGRES_USER=nextcloud
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
index 78e34d91..2e40e8d7 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@@ -19,7 +19,6 @@ services:
- LETSENCRYPT_HOST=
- LETSENCRYPT_EMAIL=
- POSTGRES_HOST=db
- - POSTGRES_DB=nextcloud
env_file:
- db.env
depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env
index dd2a4610..41106cab 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/db.env
@@ -1,2 +1,3 @@
POSTGRES_PASSWORD=
-POSTGRES_USER=postgres
+POSTGRES_DB=nextcloud
+POSTGRES_USER=nextcloud
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
index 371494ae..39e85f71 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@@ -16,7 +16,6 @@ services:
- nextcloud:/var/www/html
environment:
- POSTGRES_HOST=db
- - POSTGRES_DB=nextcloud
env_file:
- db.env
depends_on:
--
GitLab