You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/03/31 17:54:53 UTC
[1/3] guacamole-server git commit: GUACAMOLE-42: Configure log level
in docker.
Repository: guacamole-server
Updated Branches:
refs/heads/master e2feb4160 -> 3516704b8
GUACAMOLE-42: Configure log level in docker.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/1cfba831
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/1cfba831
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/1cfba831
Branch: refs/heads/master
Commit: 1cfba831644d67d326ef9b9c460297a9e88f45d6
Parents: e2feb41
Author: Nick Couchman <vn...@apache.org>
Authored: Wed Mar 28 19:54:07 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Wed Mar 28 19:55:56 2018 -0400
----------------------------------------------------------------------
Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/1cfba831/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 0e7ab0f..3449f08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -82,6 +82,7 @@ ARG PREFIX_DIR=/usr/local/guacamole
# Runtime environment
ENV LC_ALL=en_US.UTF-8
+ENV GUACD_LOG_LEVEL=info
ARG RUNTIME_DEPENDENCIES=" \
cairo \
@@ -126,5 +127,5 @@ EXPOSE 4822
# Note the path here MUST correspond to the value specified in the
# PREFIX_DIR build argument.
#
-CMD [ "/usr/local/guacamole/sbin/guacd", "-b", "0.0.0.0", "-f" ]
+CMD [ "/usr/local/guacamole/sbin/guacd", "-b", "0.0.0.0", "-L", "$GUACD_LOG_LEVEL", "-f" ]
[2/3] guacamole-server git commit: GUACAMOLE-42: Run CMD so that ENV
can be used.
Posted by mj...@apache.org.
GUACAMOLE-42: Run CMD so that ENV can be used.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/a9d01af1
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/a9d01af1
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/a9d01af1
Branch: refs/heads/master
Commit: a9d01af104bfd26ae68e742d5e3656e35d008ba2
Parents: 1cfba83
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Mar 29 04:32:06 2018 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Mar 29 04:32:06 2018 -0400
----------------------------------------------------------------------
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/a9d01af1/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 3449f08..21b98d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -127,5 +127,5 @@ EXPOSE 4822
# Note the path here MUST correspond to the value specified in the
# PREFIX_DIR build argument.
#
-CMD [ "/usr/local/guacamole/sbin/guacd", "-b", "0.0.0.0", "-L", "$GUACD_LOG_LEVEL", "-f" ]
+CMD /usr/local/guacamole/sbin/guacd -b 0.0.0.0 -L $GUACD_LOG_LEVEL -f
[3/3] guacamole-server git commit: GUACAMOLE-42: Merge changes adding
support for specifying the guacd log level for the Docker image.
Posted by mj...@apache.org.
GUACAMOLE-42: Merge changes adding support for specifying the guacd log level for the Docker image.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/3516704b
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/3516704b
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/3516704b
Branch: refs/heads/master
Commit: 3516704b82697ea2c3d28a1178cf1166f491b51f
Parents: e2feb41 a9d01af
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Mar 31 10:53:39 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Mar 31 10:53:39 2018 -0700
----------------------------------------------------------------------
Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------