Browse Source

migrate version from MaraiDB to PostgreSql to match oxyta.net pattern

Guillaume Virlet 6 years ago
parent
commit
5348257874
2 changed files with 15 additions and 16 deletions
  1. 8 4
      wallabag/README.md
  2. 7 12
      wallabag/docker-compose.yml

+ 8 - 4
wallabag/README.md

@@ -4,8 +4,8 @@ https://wallabag.org
 
 ## Configure
 ```
-export DB_PASSWORD=$(openssl rand -base64 32)
-echo MYSQL_ROOT_PASSWORD=$DB_PASSWORD >> .env
+echo POSTGRES_PASSWORD=$(openssl rand -base64 32) >> .env
+echo POSTGRES_USER=wallabag >> .env
 echo SYMFONY__ENV__DATABASE_NAME=wallabag >> .env
 echo SYMFONY__ENV__DATABASE_USER=wallabag >> .env
 echo SYMFONY__ENV__DATABASE_PASSWORD=$(openssl rand -base64 32) >> .env
@@ -15,10 +15,14 @@ echo SYMFONY__ENV__FROM_EMAIL=changeme >> .env
 echo SYMFONY__ENV__MAILER_PASSWORD=changeme >> .env
 ```
 
-Go to your browser and login with wallabag/wallabag
-DO NOT FORGET to change the password after first login
 
 ## Deploy
 ```
 docker-compose up -d
 ```
+
+## First login
+
+Go to your browser and login with wallabag/wallabag
+**DO NOT FORGET** to change the user & password after first login
+

+ 7 - 12
wallabag/docker-compose.yml

@@ -9,10 +9,10 @@ services:
     image: wallabag/wallabag
     restart: unless-stopped
     environment:
-      - SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
+      - SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql
+      - SYMFONY__ENV__DATABASE_DRIVER_CLASS=Wallabag\CoreBundle\Doctrine\DBAL\Driver\CustomPostgreSQLDriver
       - SYMFONY__ENV__DATABASE_HOST=db
-      - SYMFONY__ENV__DATABASE_PORT=3306
-      - SYMFONY__ENV__DATABASE_CHARSET=utf8mb4
+      - SYMFONY__ENV__DATABASE_PORT=5432
       - SYMFONY__ENV__DOMAIN_NAME=http://bag.${CHATONS_DOMAIN:-localhost}
     env_file:
       - .env
@@ -27,22 +27,17 @@ services:
       - web
 
   db:
-    image: mariadb
+    image: postgres:10-alpine
     restart: unless-stopped
+    environment:
+      - POSTGRES_DB=workaround # DB created by wallabag
     env_file:
       - .env
     volumes:
-      - db:/var/lib/mysql
-    networks:
-      - default
-
-  redis:
-    image: redis:alpine
-    restart: unless-stopped
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/wallabag/db:/var/lib/postgresql/data
     networks:
       - default
 
 volumes:
   images:
   data:
-  db: