Fixes suggested by catalog maintainer

templates/apache-guacamole/0/README.md

@@ -6,8 +6,6 @@ Thanks to HTML5, once Guacamole is installed on a server, all you need to access
 
 This service uses the official Apache [http://guacamole.incubator.apache.org](https://hub.docker.com/r/glyptodon/guacamole/) Guacamole image. It also uses the official MariaDB image as its backend.
 Health checks are enabled on all services.
-## Prerequisites
-You must have the Rancher-NFS storage driver set up. This is required for persistent SQL storage, otherwise all users and connection settings will be reset on every container move.
 
 ## How to use
 

templates/apache-guacamole/0/docker-compose.yml

@@ -3,11 +3,11 @@ services:
   database:
     image: mariadb
     environment:
-      MYSQL_DATABASE: guacamole_db
+      MYSQL_DATABASE: ${guacamole_db}
       MYSQL_ONETIME_PASSWORD: 'true'
-      MYSQL_PASSWORD: guacamole_password
+      MYSQL_PASSWORD: ${guacamole_password}
       MYSQL_RANDOM_ROOT_PASSWORD: 'true'
-      MYSQL_USER: guacamole_user
+      MYSQL_USER: ${guacamole_user}
     volumes_from:
     - db-data
     labels:
@@ -38,14 +38,14 @@ services:
   guacamole:
     image: glyptodon/guacamole
     environment:
-      MYSQL_DATABASE: guacamole_db
+      MYSQL_DATABASE: ${guacamole_db}
       MYSQL_HOSTNAME: database
-      MYSQL_PASSWORD: guacamole_password
-      MYSQL_USER: guacamole_user
+      MYSQL_PASSWORD: ${guacamole_password}
+      MYSQL_USER: ${guacamole_user}
     links:
     - guacd:guacd
     ports:
-    - 8080:8080/tcp
+    - ${public_port}:8080/tcp
     command:
     - /bin/bash
     - -c