PB-8460: Update docker-compose files

docker-compose.yml → docker-compose/docker-compose-ce.yaml

@@ -1,26 +1,33 @@
-version: '3.4'
+version: '3.7'
 services:
   db:
-    image: mariadb:10.3
-    env_file:
-      - env/mysql.env
+    image: mariadb:latest
+    restart: unless-stopped
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "true"
+      MYSQL_DATABASE: "passbolt"
+      MYSQL_USER: "passbolt"
+      MYSQL_PASSWORD: "P4ssb0lt"
     volumes:
       - database_volume:/var/lib/mysql
-    ports:
-      - "127.0.0.1:3306:3306"
 
   passbolt:
     image: passbolt/passbolt:latest-ce
     #Alternatively you can use rootless:
     #image: passbolt/passbolt:latest-ce-non-root
+    restart: unless-stopped
     tty: true
     depends_on:
       - db
-    env_file:
-      - env/passbolt.env
+    environment:
+      APP_FULL_BASE_URL: http://localhost
+      DATASOURCES_DEFAULT_HOST: "db"
+      DATASOURCES_DEFAULT_USERNAME: "passbolt"
+      DATASOURCES_DEFAULT_PASSWORD: "P4ssb0lt"
+      DATASOURCES_DEFAULT_DATABASE: "passbolt"
     volumes:
       - gpg_volume:/etc/passbolt/gpg
-      - images_volume:/usr/share/php/passbolt/webroot/img/public
+      - jwt_volume:/etc/passbolt/jwt
     command: ["/usr/bin/wait-for.sh", "-t", "0", "db:3306", "--", "/docker-entrypoint.sh"]
     ports:
       - 80:80
@@ -32,4 +39,4 @@ services:
 volumes:
   database_volume:
   gpg_volume:
-  images_volume:
+  jwt_volume:

docker-compose/docker-compose-pro.yaml

@@ -0,0 +1,43 @@
+version: '3.7'
+services:
+  db:
+    image: mariadb:latest
+    restart: unless-stopped
+    environment:
+      MYSQL_RANDOM_ROOT_PASSWORD: "true"
+      MYSQL_DATABASE: "passbolt"
+      MYSQL_USER: "passbolt"
+      MYSQL_PASSWORD: "P4ssb0lt"
+    volumes:
+      - database_volume:/var/lib/mysql
+
+  passbolt:
+    image: passbolt/passbolt:latest-pro
+    #Alternatively you can use rootless:
+    #image: passbolt/passbolt:latest-pro-non-root
+    restart: unless-stopped
+    tty: true
+    depends_on:
+      - db
+    environment:
+      APP_FULL_BASE_URL: http://localhost
+      DATASOURCES_DEFAULT_HOST: "db"
+      DATASOURCES_DEFAULT_USERNAME: "passbolt"
+      DATASOURCES_DEFAULT_PASSWORD: "P4ssb0lt"
+      DATASOURCES_DEFAULT_DATABASE: "passbolt"
+    volumes:
+      - gpg_volume:/etc/passbolt/gpg
+      - jwt_volume:/etc/passbolt/jwt
+      - ./subscription_key.txt:/etc/passbolt/subscription_key.txt:ro
+    command: ["/usr/bin/wait-for.sh", "-t", "0", "db:3306", "--", "/docker-entrypoint.sh"]
+    ports:
+      - 80:80
+      - 443:443
+    #Alternatively for non-root images:
+    # - 80:8080
+    # - 443:4433
+
+volumes:
+  database_volume:
+  gpg_volume:
+  jwt_volume: