GUACAMOLE-93: Merge fix for client docker build.
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/30639f28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/30639f28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/30639f28 Branch: refs/heads/master Commit: 30639f2805f656784ff82400ec86b1abadf90e12 Parents: 25d259e dce39bd Author: James Muehlner <[email protected]> Authored: Sun Aug 28 14:51:56 2016 -0700 Committer: James Muehlner <[email protected]> Committed: Sun Aug 28 14:51:56 2016 -0700 ---------------------------------------------------------------------- .dockerignore | 9 +++ Dockerfile | 52 +++++++++++++++ .../modules/guacamole-auth-jdbc-dist/pom.xml | 68 ++++++++++++++++++++ .../project-assembly.xml | 52 +++++++++++++++ extensions/guacamole-auth-jdbc/pom.xml | 32 +-------- .../src/main/assembly/dist.xml | 45 ------------- guacamole-docker/.dockerignore | 3 - guacamole-docker/.gitignore | 1 - guacamole-docker/Dockerfile | 52 --------------- guacamole-docker/bin/build-guacamole.sh | 2 +- 10 files changed, 185 insertions(+), 131 deletions(-) ----------------------------------------------------------------------
