You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/10/13 01:58:46 UTC
[1/2] incubator-guacamole-client git commit: GUACAMOLE-97: Update
Guacamole Docker README.md with respect to Apache.
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master 057a09226 -> 02a03c83f
GUACAMOLE-97: Update Guacamole Docker README.md with respect to Apache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/a7564f3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/a7564f3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/a7564f3d
Branch: refs/heads/master
Commit: a7564f3da4c336b027e846e69f3a23504f19b2ca
Parents: 057a092
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Oct 4 12:19:16 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Oct 4 12:29:10 2016 -0700
----------------------------------------------------------------------
guacamole-docker/README.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/a7564f3d/guacamole-docker/README.md
----------------------------------------------------------------------
diff --git a/guacamole-docker/README.md b/guacamole-docker/README.md
index 1152af1..04066a0 100644
--- a/guacamole-docker/README.md
+++ b/guacamole-docker/README.md
@@ -12,7 +12,7 @@ How to use this image
=====================
Using this image will require an existing, running Docker container with the
-[guacd image](https://registry.hub.docker.com/u/glyptodon/guacd/), and another
+[guacd image](https://registry.hub.docker.com/u/guacamole/guacd/), and another
Docker container providing either a PostgreSQL or MySQL database.
The name of the database and all associated credentials are specified with
@@ -36,7 +36,7 @@ Deploying Guacamole with PostgreSQL authentication
-e POSTGRES_DATABASE=guacamole_db \
-e POSTGRES_USER=guacamole_user \
-e POSTGRES_PASSWORD=some_password \
- -d -p 8080:8080 glyptodon/guacamole
+ -d -p 8080:8080 guacamole/guacamole
Linking Guacamole to PostgreSQL requires three environment variables. If any of
these environment variables are omitted, you will receive an error message, and
@@ -56,10 +56,10 @@ To generate a SQL script which can be used to initialize a fresh PostgreSQL
database
[as documented in the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql):
- docker run --rm glyptodon/guacamole /opt/guacamole/bin/initdb.sh --postgres > initdb.sql
+ docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --postgres > initdb.sql
Alternatively, you can use the SQL scripts included with
-[guacamole-auth-jdbc](http://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-jdbc-0.9.6.tar.gz/download).
+[guacamole-auth-jdbc](https://github.com/apache/incubator-guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema).
Once this script is generated, you must:
@@ -80,7 +80,7 @@ Deploying Guacamole with MySQL authentication
-e MYSQL_DATABASE=guacamole_db \
-e MYSQL_USER=guacamole_user \
-e MYSQL_PASSWORD=some_password \
- -d -p 8080:8080 glyptodon/guacamole
+ -d -p 8080:8080 guacamole/guacamole
Linking Guacamole to MySQL requires three environment variables. If any of
these environment variables are omitted, you will receive an error message, and
@@ -99,10 +99,10 @@ necessary SQL to do this is included in the Guacamole image.
To generate a SQL script which can be used to initialize a fresh MySQL database
[as documented in the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql):
- docker run --rm glyptodon/guacamole /opt/guacamole/bin/initdb.sh --mysql > initdb.sql
+ docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --mysql > initdb.sql
Alternatively, you can use the SQL scripts included with
-[guacamole-auth-jdbc](http://sourceforge.net/projects/guacamole/files/current/extensions/guacamole-auth-jdbc-0.9.6.tar.gz/download).
+[guacamole-auth-jdbc](https://github.com/apache/incubator-guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema).
Once this script is generated, you must:
[2/2] incubator-guacamole-client git commit: GUACAMOLE-97: Merge
docker README updates.
Posted by jm...@apache.org.
GUACAMOLE-97: Merge docker README updates.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/02a03c83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/02a03c83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/02a03c83
Branch: refs/heads/master
Commit: 02a03c83f0770e4bb6a737eb8ccf1ba72b1486de
Parents: 057a092 a7564f3
Author: James Muehlner <ja...@guac-dev.org>
Authored: Wed Oct 12 18:57:29 2016 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Wed Oct 12 18:57:29 2016 -0700
----------------------------------------------------------------------
guacamole-docker/README.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------