This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit d6ff746808e07d487761f6b929b2655e05c5224f Merge: 83111616e 1b271a240 Author: Virtually Nick <[email protected]> AuthorDate: Thu Apr 25 20:44:03 2024 -0400 GUACAMOLE-374: Merge generalize Docker image to automatically map environment variables to properties. Dockerfile | 16 +- guacamole-docker/bin/build-guacamole.sh | 186 +-- guacamole-docker/bin/entrypoint.sh | 39 + guacamole-docker/bin/start.sh | 1251 -------------------- .../build.d/000-build-and-install-guacamole.sh | 62 + .../build.d/010-map-guacamole-extensions.sh | 118 ++ guacamole-docker/build.d/020-download-drivers.sh | 99 ++ guacamole-docker/build.d/999-verify-sanity.sh | 47 + .../entrypoint.d/000-migrate-legacy-variables.sh | 116 ++ .../entrypoint.d/100-generate-guacamole-home.sh | 111 ++ .../500-generate-tomcat-catalina-base.sh | 50 + .../entrypoint.d/700-configure-features.sh | 88 ++ guacamole-docker/entrypoint.d/999-start-tomcat.sh | 30 + .../environment/REMOTE_IP_VALVE_/configure.sh | 61 + .../properties/EnumGuacamoleProperty.java | 40 +- .../properties/EnumGuacamolePropertyTest.java | 4 +- .../guacamole/GuacamoleServletContextListener.java | 57 +- .../SystemFileEnvironmentGuacamoleProperties.java | 64 + .../java/org/apache/guacamole/log/LogLevel.java | 163 +++ .../java/org/apache/guacamole/log/LogModule.java | 84 +- guacamole/src/main/resources/logback.xml | 34 - 21 files changed, 1244 insertions(+), 1476 deletions(-)
