GUACAMOLE-1316: Remove all unnecessary trailing whitespace from Docker-related files.

This commit is contained in:
Michael Jumper
2021-04-02 11:27:17 -07:00
parent bdb2ad35ef
commit fae16c7ff3
2 changed files with 53 additions and 49 deletions

View File

@@ -37,8 +37,8 @@ the container.
This is useful for specifying sensitive info, ie. passwords for This is useful for specifying sensitive info, ie. passwords for
the database, in secured files instead of plaintext environment variables. This the database, in secured files instead of plaintext environment variables. This
is generally used for loading values from [Docker secrets](https://docs.docker.com/engine/swarm/secrets/#read-more-about-docker-secret-commands), which are stored at is generally used for loading values from [Docker secrets](https://docs.docker.com/engine/swarm/secrets/#read-more-about-docker-secret-commands),
`/run/secrets/<secret_name>` within the container. which are stored at `/run/secrets/<secret_name>` within the container.
It is important to note that the startup script is configured such that: It is important to note that the startup script is configured such that:
@@ -68,16 +68,18 @@ Linking Guacamole to PostgreSQL requires three environment variables. If any of
these environment variables are omitted, you will receive an error message, and these environment variables are omitted, you will receive an error message, and
the image will stop: the image will stop:
1. `POSTGRES_DATABASE` - The name of the database to use for Guacamole authentication. 1. `POSTGRES_DATABASE` - The name of the database to use for Guacamole
authentication.
2. `POSTGRES_USER` - The user that Guacamole will use to connect to PostgreSQL. 2. `POSTGRES_USER` - The user that Guacamole will use to connect to PostgreSQL.
3. `POSTGRES_PASSWORD` - The password that Guacamole will provide when connecting to 3. `POSTGRES_PASSWORD` - The password that Guacamole will provide when
PostgreSQL as `POSTGRES_USER`. connecting to PostgreSQL as `POSTGRES_USER`.
4. `POSTGRES_DATABASE_FILE` - The path of the docker secret containing the name of database 4. `POSTGRES_DATABASE_FILE` - The path of the docker secret containing the name
to use for Guacamole authentication. of database to use for Guacamole authentication.
5. `POSTGRES_USER_FILE` - The path of the docker secret containing the name of the 5. `POSTGRES_USER_FILE` - The path of the docker secret containing the name of
user that Guacamole will use to connect to PostgreSQL. the user that Guacamole will use to connect to PostgreSQL.
6. `POSTGRES_PASSWORD_FILE` - The path of the docker secret containing the password 6. `POSTGRES_PASSWORD_FILE` - The path of the docker secret containing the
that Guacamole will provide when connecting to PostgreSQL as `POSTGRES_USER. password that Guacamole will provide when connecting to PostgreSQL as
`POSTGRES_USER.
### Initializing the PostgreSQL database ### Initializing the PostgreSQL database
@@ -123,16 +125,18 @@ Linking Guacamole to MySQL requires three environment variables. If any of
these environment variables are omitted, you will receive an error message, and these environment variables are omitted, you will receive an error message, and
the image will stop: the image will stop:
1. `MYSQL_DATABASE` - The name of the database to use for Guacamole authentication. 1. `MYSQL_DATABASE` - The name of the database to use for Guacamole
authentication.
2. `MYSQL_USER` - The user that Guacamole will use to connect to MySQL. 2. `MYSQL_USER` - The user that Guacamole will use to connect to MySQL.
3. `MYSQL_PASSWORD` - The password that Guacamole will provide when connecting 3. `MYSQL_PASSWORD` - The password that Guacamole will provide when connecting
to MySQL as `MYSQL_USER`. to MySQL as `MYSQL_USER`.
4. `MYSQL_DATABASE_FILE` - The path of the docker secret containing the name of the 4. `MYSQL_DATABASE_FILE` - The path of the docker secret containing the name of
database to use for Guacamole authentication. the database to use for Guacamole authentication.
5. `MYSQL_USER_FILE` - The path of the docker secret containing the name of the user 5. `MYSQL_USER_FILE` - The path of the docker secret containing the name of the
that Guacamole will use to connect to MySQL. user that Guacamole will use to connect to MySQL.
6. `MYSQL_PASSWORD_FILE` - The path of the docker secret containing the password 6. `MYSQL_PASSWORD_FILE` - The path of the docker secret containing the
that Guacamole will provide when connecting to MySQL as`MYSQL_USER`. password that Guacamole will provide when connecting to MySQL
as`MYSQL_USER`.
### Initializing the MySQL database ### Initializing the MySQL database