Browse Source

wallabag: put const vars in docker-compose, ref #70

Guilhem Saurel 6 years ago
parent
commit
971c6564d0
2 changed files with 2 additions and 4 deletions
  1. 0 3
      bag/README.md
  2. 2 1
      bag/docker-compose.yml

+ 0 - 3
bag/README.md

@@ -6,8 +6,6 @@ https://wallabag.org
 ```
 export DB_PASSWORD=$(openssl rand -base64 32)
 echo POSTGRES_PASSWORD=$DB_PASSWORD >> .env
-echo POSTGRES_USER=wallabag >> .env
-echo SYMFONY__ENV__DATABASE_USER=wallabag >> .env
 echo SYMFONY__ENV__DATABASE_PASSWORD=$DB_PASSWORD >> .env
 echo SYMFONY__ENV__MAILER_HOST=changeme >> .env
 echo SYMFONY__ENV__MAILER_USER=changeme >> .env
@@ -25,4 +23,3 @@ docker-compose up -d
 
 Go to your browser and login with wallabag/wallabag
 **DO NOT FORGET** to change the user & password after first login
-

+ 2 - 1
bag/docker-compose.yml

@@ -14,6 +14,7 @@ services:
       - SYMFONY__ENV__DATABASE_HOST=db
       - SYMFONY__ENV__DATABASE_PORT=5432
       - SYMFONY__ENV__DATABASE_NAME=wallabag
+      - SYMFONY__ENV__DATABASE_USER=wallabag
       - SYMFONY__ENV__DOMAIN_NAME=http://bag.${CHATONS_DOMAIN:-localhost}
     env_file:
       - .env
@@ -32,10 +33,10 @@ services:
     restart: unless-stopped
     environment:
       - POSTGRES_DB=workaround # DB created by wallabag
+      - POSTGRES_USER=wallabag
     env_file:
       - .env
     volumes:
       - ${CHATONS_ROOT_DIR:-/srv/chatons}/bag/db:/var/lib/postgresql/data
     networks:
       - default
-