edekakam/guac-install
1
0
Fork 0
mirror of https://git.koehlerweb.org/frodovdr/guac-install synced 2025-04-23 12:53:12 +02:00
Code Issues Releases Wiki Activity

Compare commits

base: edekakam:2dac1f3b7de8d7ae8eccdb4cf18446ff8029f310
Branches Tags
edekakam:main
...
compare: edekakam:24a0d4f36dfedda206035090037eed97003a4bf8
Branches Tags
edekakam:main

2 Commits
2dac1f3b7d ... 24a0d4f36d

Author SHA1 Message Date
MysticRyuujin
24a0d4f36d Use healthcheck/mysql 2021-03-09 12:28:31 -06:00
MysticRyuujin
996ec35e17 add libc-bin - might fix #171 2021-03-09 12:11:16 -06:00
3 changed files with 11 additions and 9 deletions
Show Stats Expand all files Collapse all files

16
docker-install.sh
View File

@ -53,7 +53,7 @@ fi
# Install Stuff # Install Stuff
apt-get update apt-get update
apt-get -y install docker-ce mysql-client wget apt-get -y install docker-ce docker-ce-cli containerd.io mysql-client wget
# Set SERVER to be the preferred download server from the Apache CDN # Set SERVER to be the preferred download server from the Apache CDN
SERVER="http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUACVERSION}" SERVER="http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${GUACVERSION}"
@ -69,11 +69,13 @@ fi
tar -xzf guacamole-auth-jdbc-${GUACVERSION}.tar.gz tar -xzf guacamole-auth-jdbc-${GUACVERSION}.tar.gz
# Start MySQL # Start MySQL
docker run --restart=always --detach --name=mysql --env="MYSQL_ROOT_PASSWORD=$mysqlrootpassword" --publish 3306:3306 mysql docker run --restart=always --detach --name=mysql --env="MYSQL_ROOT_PASSWORD=$mysqlrootpassword" --publish 3306:3306 healthcheck/mysql
# Sleep to let MySQL load (there's probably a better way to do this) # Wait for the MySQL Health Check equal "healthy"
echo "Waiting 30 seconds for MySQL to load" echo "Waiting for MySQL to be healthy"
sleep 30 until [ "`/usr/bin/docker inspect -f {{.State.Health.Status}} mysql`"=="healthy" ]; do
sleep 0.1;
done;
# Create the Guacamole database and the user account # Create the Guacamole database and the user account
# SQL Code # SQL Code
@ -88,7 +90,7 @@ echo $SQLCODE | mysql -h 127.0.0.1 -P 3306 -u root -p$mysqlrootpassword
cat guacamole-auth-jdbc-${GUACVERSION}/mysql/schema/*.sql | mysql -u root -p$mysqlrootpassword -h 127.0.0.1 -P 3306 guacamole_db cat guacamole-auth-jdbc-${GUACVERSION}/mysql/schema/*.sql | mysql -u root -p$mysqlrootpassword -h 127.0.0.1 -P 3306 guacamole_db
docker run --restart=always --name guacd -d guacamole/guacd docker run --restart=always --name guacd --detach guacamole/guacd
docker run --restart=always --name guacamole --link mysql:mysql --link guacd:guacd -e MYSQL_HOSTNAME=127.0.0.1 -e MYSQL_DATABASE=guacamole_db -e MYSQL_USER=guacamole_user -e MYSQL_PASSWORD=$guacdbuserpassword --detach -p 8080:8080 guacamole/guacamole docker run --restart=always --name guacamole --detach --link mysql:mysql --link guacd:guacd -e MYSQL_HOSTNAME=127.0.0.1 -e MYSQL_DATABASE=guacamole_db -e MYSQL_USER=guacamole_user -e MYSQL_PASSWORD=$guacdbuserpassword -p 8080:8080 guacamole/guacamole
rm -rf guacamole-auth-jdbc-${GUACVERSION}* rm -rf guacamole-auth-jdbc-${GUACVERSION}*

2
guac-install-server.sh
View File

@ -37,7 +37,7 @@ apt-get -qq update
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
apt-get -y install build-essential libcairo2-dev ${JPEGTURBO} ${LIBPNG} libossp-uuid-dev libavcodec-dev libavformat-dev libavutil-dev \ apt-get -y install build-essential libcairo2-dev ${JPEGTURBO} ${LIBPNG} libossp-uuid-dev libavcodec-dev libavformat-dev libavutil-dev \
libswscale-dev freerdp2-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev \ libswscale-dev freerdp2-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev \
libvorbis-dev libwebp-dev libwebsockets-dev wget libtool-bin libvorbis-dev libwebp-dev libwebsockets-dev wget libtool-bin libc-bin
# If apt fails to run completely the rest of this isn't going to work... # If apt fails to run completely the rest of this isn't going to work...
if [ $? != 0 ]; then if [ $? != 0 ]; then

2
guac-install.sh
View File

@ -304,7 +304,7 @@ export DEBIAN_FRONTEND=noninteractive
# Required packages # Required packages
apt-get -y install build-essential libcairo2-dev ${JPEGTURBO} ${LIBPNG} libossp-uuid-dev libavcodec-dev libavformat-dev libavutil-dev \ apt-get -y install build-essential libcairo2-dev ${JPEGTURBO} ${LIBPNG} libossp-uuid-dev libavcodec-dev libavformat-dev libavutil-dev \
libswscale-dev freerdp2-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev \ libswscale-dev freerdp2-dev libpango1.0-dev libssh2-1-dev libtelnet-dev libvncserver-dev libpulse-dev libssl-dev \
libvorbis-dev libwebp-dev libwebsockets-dev freerdp2-x11 libtool-bin ghostscript dpkg-dev wget crudini \ libvorbis-dev libwebp-dev libwebsockets-dev freerdp2-x11 libtool-bin ghostscript dpkg-dev wget crudini libc-bin \
${MYSQL} ${LIBJAVA} ${TOMCAT} &>> ${LOG} ${MYSQL} ${LIBJAVA} ${TOMCAT} &>> ${LOG}
# If apt fails to run completely the rest of this isn't going to work... # If apt fails to run completely the rest of this isn't going to work...