cloudron
/
guacamole-app
mirror of https://git.cloudron.io/dswd/guacamole-app
1
0
Fork 0
Code Issues Releases Wiki Activity

More fixes

This commit is contained in:
Dennis Schwerdel 2017-01-25 10:51:18 +01:00
parent 914fe1117d
commit a425984d29
5 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CHANGELOG
View File

@ -1,19 +1,2 @@
[0.1.0] [0.1.0]
* Initial version * Initial version
[0.1.1]
* Update to upstream version 1.10.2.143
[0.1.2]
* Update base image
* Update to upstream version 1.10.3.151
[0.1.3]
* Update post install
[0.2.0]
* Update RainLoop to 1.10.4.183
[0.3.0]
* Update RainLoop to 1.10.5.192

4
CloudronManifest.json
View File

@ -12,7 +12,7 @@
"mysql": {}, "mysql": {},
"ldap": {} "ldap": {}
}, },
"developmentMode": false, "memoryLimit": 2048,
"manifestVersion": 1, "manifestVersion": 1,
"website": "http://guacamole.incubator.apache.org/", "website": "http://guacamole.incubator.apache.org/",
"contactEmail": "support@cloudron.io", "contactEmail": "support@cloudron.io",
@ -21,7 +21,7 @@
"vnc", "rdp", "ssh", "rdesktop" "vnc", "rdp", "ssh", "rdesktop"
], ],
"mediaLinks": [ "mediaLinks": [
"file:///screenshots/1.jpg" "http://www.example.com"
], ],
"postInstallMessage": "file://POSTINSTALL.md" "postInstallMessage": "file://POSTINSTALL.md"
} }

14
Dockerfile
View File

@ -41,16 +41,22 @@ RUN mkdir -p /app/code/lib \
&& rm -rf mysql-connector-java-${MYSQL_CONNECTOR_VERSION} && rm -rf mysql-connector-java-${MYSQL_CONNECTOR_VERSION}
# Get WAR app # Get WAR app
RUN mkdir -p /app/code/war \ RUN wget "$DOWNLOAD_URL/binary/guacamole-${VERSION}.war" -O /app/code/guacamole.war \
&& wget "$DOWNLOAD_URL/binary/guacamole-${VERSION}.war" -O /app/code/war/ROOT.war \ && mkdir /app/code/guacamole-web \
&& ln -s /app/code/war /usr/share/tomcat8/webapps && cd /app/code/guacamole-web \
&& unzip /app/code/guacamole.war \
&& rm /app/code/guacamole.war
# Configure Tomcat # Configure Tomcat
RUN ln -s /run/tomcat/temp /usr/share/tomcat8/temp \ RUN ln -s /run/tomcat/temp /usr/share/tomcat8/temp \
&& ln -s /run/tomcat/logs /usr/share/tomcat8/logs \
&& ln -s /run/tomcat/work /usr/share/tomcat8/work \
&& ln -s /etc/tomcat8 /usr/share/tomcat8/conf \ && ln -s /etc/tomcat8 /usr/share/tomcat8/conf \
&& ln -s /run/guacamole/guacamole.properties /app/code/guacamole.properties && ln -s /run/guacamole/guacamole.properties /app/code/guacamole.properties \
&& ln -s /run/tomcat/webapps /usr/share/tomcat8/webapps
ENV GUACAMOLE_HOME /app/code ENV GUACAMOLE_HOME /app/code
ENV JAVA_OPTS "-Djava.awt.headless=true -server -Xmx512M -Djava.security.egd=file:/dev/urandom"
ADD start.sh /app/code/start.sh ADD start.sh /app/code/start.sh

4
POSTINSTALL.md
View File

@ -5,4 +5,6 @@ To store connection data of custom permissions for Cloudron users, a Guacamole a
There is a default admin user in Guacamole with the following credentials: There is a default admin user in Guacamole with the following credentials:
* Username: `guacadmin` * Username: `guacadmin`
* Password: `guacadmin` (please change that password immediatly) * Password: `guacadmin`
**Please change the admin password on first login**

26
start.sh
View File

@ -4,21 +4,23 @@ set -eu
mkdir -p /run/guacamole mkdir -p /run/guacamole
cat > /run/guacamole/guacamole.properties <<EOF cat > /run/guacamole/guacamole.properties <<EOF
ldap-hostname=${LDAP_SERVER} ldap-hostname:${LDAP_SERVER}
ldap-port=${LDAP_PORT} ldap-port:${LDAP_PORT}
ldap-search-bind-dn=${LDAP_BIND_DN} ldap-search-bind-dn:${LDAP_BIND_DN}
ldap-search-bind-password=${LDAP_BIND_PASSWORD} ldap-search-bind-password:${LDAP_BIND_PASSWORD}
ldap-user-base-dn=${LDAP_USERS_BASE_DN} ldap-user-base-dn:${LDAP_USERS_BASE_DN}
ldap-group-base-dn=${LDAP_GROUPS_BASE_DN} ldap-group-base-dn:${LDAP_GROUPS_BASE_DN}
ldap-username-attribute:username ldap-username-attribute:username
mysql-hostname=${MYSQL_HOST} mysql-hostname:${MYSQL_HOST}
mysql-port=${MYSQL_PORT} mysql-port:${MYSQL_PORT}
mysql-database=${MYSQL_DATABASE} mysql-database:${MYSQL_DATABASE}
mysql-username=${MYSQL_USERNAME} mysql-username:${MYSQL_USERNAME}
mysql-password=${MYSQL_PASSWORD} mysql-password:${MYSQL_PASSWORD}
EOF EOF
mkdir -p /run/tomcat/temp mkdir -p /run/tomcat/temp /run/tomcat/logs /run/tomcat/work /run/tomcat/webapps
cp -a /app/code/guacamole-web /run/tomcat/webapps/ROOT
MYSQL="mysql -u ${MYSQL_USERNAME} -p${MYSQL_PASSWORD} -h ${MYSQL_HOST} --port ${MYSQL_PORT} --database ${MYSQL_DATABASE}" MYSQL="mysql -u ${MYSQL_USERNAME} -p${MYSQL_PASSWORD} -h ${MYSQL_HOST} --port ${MYSQL_PORT} --database ${MYSQL_DATABASE}"