Moved .envs and adduser.sh

passbolt/adduser.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+read -p "Email: " email
+read -p "First name: " firstname
+read -p "Surname: " surname
+docker-compose exec passbolt su -m -c "/var/www/passbolt/bin/cake \
+                                passbolt register_user \
+                                -u $email \
+                                -f $firstname \
+                                -l $surname \
+                                -r admin" -s /bin/sh www-data

passbolt/docker-compose.yml

@@ -2,9 +2,16 @@ version: '3.0'
 services:
   passbolt:
     image: passbolt/passbolt
-    env_file: .env.passbolt
+    tty: true
+    env_file: env/passbolt
     ports:
       - ${PORT}:80
+    volumes:
+      - gpg_volume:/var/www/passbolt/config/gpg
+      - images_volume:/var/www/passbolt/webroot/img/public
+    tmpfs:
+      - /run
+    command: ["/usr/bin/wait-for.sh", "-t", "0", "db:3306", "--", "/docker-entrypoint.sh"]
     links:
       - db:db
     restart: unless-stopped
@@ -13,8 +20,10 @@ services:
     image: mariadb:latest
     volumes:
       - data:/var/lib/mysql
-    env_file: .env.db
+    env_file: env/db
     restart: unless-stopped
 
 volumes:
   data:
+  gpg_volume:
+  images_volume:

passbolt/env/db.example

@@ -1,4 +1,4 @@
 MYSQL_RANDOM_ROOT_PASSWORD=yes
 MYSQL_USER=passbolt
-MYSQL_PASSWORD: <changeme>
+MYSQL_PASSWORD=<changeme>
 MYSQL_DATABASE=passbolt