cursorius/server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Cleanup gitea override docker logic

Browse Source
This commit is contained in:
restitux
2023-01-31 18:48:17 -07:00
parent 1e0526a599
commit 724757b23c
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/webhook-override.yml → docker/gitea-override.yml
View File
docker/run-dev.sh
+33 -9
View File
@@ -8,9 +8,13 @@ mkdir -p _working/jobs
base_default_compose_files="docker/docker-compose.yml" base_default_compose_files="docker/docker-compose.yml"
default_compose_files="$base_default_compose_files" default_compose_files="$base_default_compose_files"
if [ -f "docker/docker-compose.override.yml" ] override_compose="docker/docker-compose.override.yml"
gitea_compose="docker/gitea-override.yml"
if [ -f "$override_compose" ]
then then
default_compose_files+=" docker/docker-compose.override.yml" default_compose_files+=" $override_compose"
else else
default_compose_files="docker/docker-compose.yml" default_compose_files="docker/docker-compose.yml"
fi fi
@@ -20,9 +24,9 @@ function stop_containers {
if [ "$current_containers" == "default" ] if [ "$current_containers" == "default" ]
then then
compose_files="$default_compose_files" compose_files="$default_compose_files"
elif [ "$current_containers" == "webhook" ] elif [ "$current_containers" == "gitea" ]
then then
compose_files="$default_compose_files docker/webhook-override.yml" compose_files="$default_compose_files $gitea_compose"
fi fi
compose_file_flags=$(echo "$compose_files" | tr ' ' '\n' | xargs -I'{}' echo "-f {} " | tr -d '\n') compose_file_flags=$(echo "$compose_files" | tr ' ' '\n' | xargs -I'{}' echo "-f {} " | tr -d '\n')
docker compose $compose_file_flags down docker compose $compose_file_flags down
@@ -33,14 +37,28 @@ function show_logs {
if [ "$current_containers" == "default" ] if [ "$current_containers" == "default" ]
then then
compose_files="$default_compose_files" compose_files="$default_compose_files"
elif [ "$current_containers" == "webhook" ] elif [ "$current_containers" == "gitea" ]
then then
compose_files="$default_compose_files docker/webhook-override.yml" compose_files="$default_compose_files $gitea_compose"
fi fi
compose_file_flags=$(echo "$compose_files" | tr ' ' '\n' | xargs -I'{}' echo "-f {} " | tr -d '\n') compose_file_flags=$(echo "$compose_files" | tr ' ' '\n' | xargs -I'{}' echo "-f {} " | tr -d '\n')
docker compose $compose_file_flags logs -f docker compose $compose_file_flags logs -f
} }
function show_ps {
current_containers="$(cat _working/current_containers)"
if [ "$current_containers" == "default" ]
then
compose_files="$default_compose_files"
elif [ "$current_containers" == "gitea" ]
then
compose_files="$default_compose_files $gitea_compose"
fi
compose_file_flags=$(echo "$compose_files" | tr ' ' '\n' | xargs -I'{}' echo "-f {} " | tr -d '\n')
docker compose $compose_file_flags ps
}
case $1 in case $1 in
"default") "default")
echo "default" > _working/current_containers echo "default" > _working/current_containers
@@ -48,17 +66,23 @@ case $1 in
compose_file_flags=$(echo "$compose_files" | tr ' ' '\n' | xargs -I'{}' echo "-f {} " | tr -d '\n') compose_file_flags=$(echo "$compose_files" | tr ' ' '\n' | xargs -I'{}' echo "-f {} " | tr -d '\n')
docker compose $compose_file_flags up --build -d docker compose $compose_file_flags up --build -d
docker compose $compose_file_flags logs -f;; docker compose $compose_file_flags logs -f;;
"webhook") "gitea")
echo "webhook" > _working/current_containers echo "gitea" > _working/current_containers
stop_containers stop_containers
compose_files="$default_compose_files docker/webhook-override.yml" compose_files="$default_compose_files $gitea_compose"
compose_file_flags=$(echo "$compose_files" | tr ' ' '\n' | xargs -I'{}' echo "-f {} " | tr -d '\n') compose_file_flags=$(echo "$compose_files" | tr ' ' '\n' | xargs -I'{}' echo "-f {} " | tr -d '\n')
docker compose $compose_file_flags up --build -d docker compose $compose_file_flags up --build -d
docker compose $compose_file_flags logs -f;; docker compose $compose_file_flags logs -f;;
"dbshell")
compose_files="$default_compose_files $gitea_compose"
compose_file_flags=$(echo "$compose_files" | tr ' ' '\n' | xargs -I'{}' echo "-f {} " | tr -d '\n')
docker compose $compose_file_flags exec cursorius-db psql --user=cursorius;;
"stop") "stop")
stop_containers;; stop_containers;;
"logs") "logs")
show_logs;; show_logs;;
"ps")
show_ps;;
*) echo "ERROR: Unknown param \"$1\"" 2>&1 *) echo "ERROR: Unknown param \"$1\"" 2>&1
exit 255;; exit 255;;
esac esac