mirror of
https://ghproxy.com/https://github.com/truecharts/charts.git
synced 2026-07-17 16:30:25 +08:00
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:
@@ -222,7 +222,7 @@ questions:
|
||||
description: "Memory"
|
||||
# Include{persistenceAdvanced}
|
||||
- variable: mountPath
|
||||
label: "mountPath (Non-editable"
|
||||
label: "mountPath (Non-editable)"
|
||||
description: "Path inside the container the storage is mounted"
|
||||
schema:
|
||||
type: string
|
||||
|
||||
@@ -222,7 +222,7 @@ questions:
|
||||
description: "Memory"
|
||||
# Include{persistenceAdvanced}
|
||||
- variable: mountPath
|
||||
label: "mountPath (Non-editable"
|
||||
label: "mountPath (Non-editable)"
|
||||
description: "Path inside the container the storage is mounted"
|
||||
schema:
|
||||
type: string
|
||||
|
||||
@@ -207,7 +207,7 @@ questions:
|
||||
description: "Memory"
|
||||
# Include{persistenceAdvanced}
|
||||
- variable: mountPath
|
||||
label: "mountPath (Non-editable"
|
||||
label: "mountPath (Non-editable)"
|
||||
description: "Path inside the container the storage is mounted"
|
||||
schema:
|
||||
type: string
|
||||
|
||||
@@ -25,7 +25,7 @@ sources:
|
||||
- https://hub.docker.com/r/guacamole/guacamole
|
||||
- http://guacamole.incubator.apache.org/doc/gug/introduction.html
|
||||
type: application
|
||||
version: 0.0.2
|
||||
version: 1.0.0
|
||||
annotations:
|
||||
truecharts.org/catagories: |
|
||||
- utilities
|
||||
@@ -189,43 +189,22 @@ initContainers:
|
||||
command: ["/bin/sh", "-c"]
|
||||
args:
|
||||
- >
|
||||
echo "Waiting for DB to be ready...";
|
||||
DBREADY=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 ];
|
||||
psql -h $POSTGRES_HOSTNAME -d $POSTGRES_DATABASE -U $POSTGRES_USER -p $POSTGRES_PORT -o '/dev/null' -c 'SELECT * FROM public.guacamole_user';
|
||||
if [ $? -eq 0 ];
|
||||
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 ];
|
||||
then
|
||||
echo "DB already initialized. Skipping...";
|
||||
echo "DB's schema initialized successfully!";
|
||||
exit 0;
|
||||
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 ];
|
||||
then
|
||||
echo "DB's schema initialized successfully!";
|
||||
exit 0;
|
||||
else
|
||||
echo "DB's schema failed to initialize.";
|
||||
exit 1;
|
||||
fi;
|
||||
echo "DB's schema failed to initialize.";
|
||||
exit 1;
|
||||
fi;
|
||||
else
|
||||
echo "DB failed to start.";
|
||||
fi;
|
||||
|
||||
# Until they release an image with the updated driver, we need to manually replace it.
|
||||
# https://issues.apache.org/jira/browse/GUACAMOLE-1433
|
||||
# https://github.com/apache/guacamole-client/pull/655
|
||||
Reference in New Issue
Block a user