chore(guacamole-client): clean logs (#1720)

* chore(guacamole-client): clean logs

* At least make it whole :P

* bump

* move to stable train

* db is ready at this point
This commit is contained in:
Stavros Kois
2022-01-16 11:56:02 +01:00
committed by GitHub
parent 1a06a3353a
commit 070da8b0a0
13 changed files with 14 additions and 35 deletions
+1 -1
View File
@@ -222,7 +222,7 @@ questions:
description: "Memory" description: "Memory"
# Include{persistenceAdvanced} # Include{persistenceAdvanced}
- variable: mountPath - variable: mountPath
label: "mountPath (Non-editable" label: "mountPath (Non-editable)"
description: "Path inside the container the storage is mounted" description: "Path inside the container the storage is mounted"
schema: schema:
type: string type: string
+1 -1
View File
@@ -222,7 +222,7 @@ questions:
description: "Memory" description: "Memory"
# Include{persistenceAdvanced} # Include{persistenceAdvanced}
- variable: mountPath - variable: mountPath
label: "mountPath (Non-editable" label: "mountPath (Non-editable)"
description: "Path inside the container the storage is mounted" description: "Path inside the container the storage is mounted"
schema: schema:
type: string type: string
+1 -1
View File
@@ -207,7 +207,7 @@ questions:
description: "Memory" description: "Memory"
# Include{persistenceAdvanced} # Include{persistenceAdvanced}
- variable: mountPath - variable: mountPath
label: "mountPath (Non-editable" label: "mountPath (Non-editable)"
description: "Path inside the container the storage is mounted" description: "Path inside the container the storage is mounted"
schema: schema:
type: string type: string
@@ -25,7 +25,7 @@ sources:
- https://hub.docker.com/r/guacamole/guacamole - https://hub.docker.com/r/guacamole/guacamole
- http://guacamole.incubator.apache.org/doc/gug/introduction.html - http://guacamole.incubator.apache.org/doc/gug/introduction.html
type: application type: application
version: 0.0.2 version: 1.0.0
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- utilities - utilities
@@ -189,43 +189,22 @@ initContainers:
command: ["/bin/sh", "-c"] command: ["/bin/sh", "-c"]
args: args:
- > - >
echo "Waiting for DB to be ready..."; psql -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT -o '/dev/null' -c 'SELECT * FROM public.guacamole_user';
DBREADY=0; if [ $? -eq 0 ];
for i in {1..10};
do pg_isready -t 5 -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT;
if [ $? -eq 0 ];
then
echo "DB is ready!";
DBREADY=1;
break;
else
echo "DB not ready yet.";
fi;
echo "Waiting...";
sleep 5;
done;
if [ $DBREADY -eq 1 ];
then then
psql -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT -q -c 'SELECT * FROM public.guacamole_user'; echo "DB already initialized. Skipping...";
else
echo "Initializing DB's schema...";
psql -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT -a -w -f /initdbdata/initdb.sql;
if [ $? -eq 0 ]; if [ $? -eq 0 ];
then then
echo "DB already initialized. Skipping..."; echo "DB's schema initialized successfully!";
exit 0;
else else
echo "Initializing DB's schema..."; echo "DB's schema failed to initialize.";
psql -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT -a -w -f /initdbdata/initdb.sql; exit 1;
if [ $? -eq 0 ];
then
echo "DB's schema initialized successfully!";
exit 0;
else
echo "DB's schema failed to initialize.";
exit 1;
fi;
fi; fi;
else
echo "DB failed to start.";
fi; fi;
# Until they release an image with the updated driver, we need to manually replace it. # Until they release an image with the updated driver, we need to manually replace it.
# https://issues.apache.org/jira/browse/GUACAMOLE-1433 # https://issues.apache.org/jira/browse/GUACAMOLE-1433
# https://github.com/apache/guacamole-client/pull/655 # https://github.com/apache/guacamole-client/pull/655