Browse Source

pad & cloud: use postgres:10-alpine, fix #52

Guilhem Saurel 6 years ago
parent
commit
d71e71104d
4 changed files with 16 additions and 13 deletions
  1. 4 5
      cloud/README.md
  2. 2 2
      cloud/docker-compose.yml
  3. 8 4
      pad/README.md
  4. 2 2
      pad/docker-compose.yml

+ 4 - 5
cloud/README.md

@@ -4,11 +4,10 @@ https://nextcloud.com/
 
 ## Configure
 ```
-echo MYSQL_ROOT_PASSWORD=$(openssl rand -base64 32) >> .env
-echo MYSQL_PASSWORD=$(openssl rand -base64 32) >> .env
-echo MYSQL_DATABASE=nextcloud >> .env
-echo MYSQL_USER=nextcloud >> .env
-echo MYSQL_HOST=db >> .env
+echo POSTGRES_PASSWORD=$(openssl rand -base64 32) >> .env
+echo POSTGRES_DB=nextcloud >> .env
+echo POSTGRES_USER=nextcloud >> .env
+echo POSTGRES_HOST=db >> .env
 ```
 
 ## Deploy

+ 2 - 2
cloud/docker-compose.yml

@@ -6,12 +6,12 @@ networks:
 
 services:
   db:
-    image: mariadb
+    image: postgres:10-alpine
     restart: always
     env_file:
       - .env
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/nextcloud/db:/var/lib/mysql
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/nextcloud/db:/var/lib/postgresql/data
 
   app:
     image: nextcloud:fpm-alpine

+ 8 - 4
pad/README.md

@@ -4,11 +4,15 @@ http://etherpad.org/
 
 ## Configure
 ```
-export MYSQL_ROOT_PASSWORD=$(openssl rand -base64 32)
-echo MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD >> .env
-echo ETHERPAD_DB_PASSWORD=$MYSQL_ROOT_PASSWORD >> .env
-echo ETHERPAD_DB_HOST=db >> .env
+export DB_PASSWORD=$(openssl rand -base64 32)
+echo ETHERPAD_DB_PASSWORD=$DB_PASSWORD >> .env
 echo ETHERPAD_TITLE=Bloc Note >> .env
+echo ETHERPAD_DB_HOST=db >> .env
+echo ETHERPAD_DB_TYPE=postgres >> .env
+echo ETHERPAD_DB_USER=etherpad >> .env
+echo ETHERPAD_DB_PORT=5432 >> .env
+echo POSTGRES_USER=etherpad >> .env
+echo POSTGRES_PASSWORD=$DB_PASSWORD >> .env
 ```
 
 ## Deploy

+ 2 - 2
pad/docker-compose.yml

@@ -6,12 +6,12 @@ networks:
 
 services:
   db:
-    image: mariadb
+    image: postgres:10-alpine
     restart: always
     env_file:
       - .env
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/etherpad/db:/var/lib/mysql
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/etherpad/db:/var/lib/postgresql/data
 
   app:
     build: .