diff --git a/docker/webhook-override.yml b/docker/gitea-override.yml similarity index 100% rename from docker/webhook-override.yml rename to docker/gitea-override.yml diff --git a/docker/run-dev.sh b/docker/run-dev.sh index 309547c..63c6cb5 100755 --- a/docker/run-dev.sh +++ b/docker/run-dev.sh @@ -8,9 +8,13 @@ mkdir -p _working/jobs base_default_compose_files="docker/docker-compose.yml" 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 - default_compose_files+=" docker/docker-compose.override.yml" + default_compose_files+=" $override_compose" else default_compose_files="docker/docker-compose.yml" fi @@ -20,9 +24,9 @@ function stop_containers { if [ "$current_containers" == "default" ] then compose_files="$default_compose_files" - elif [ "$current_containers" == "webhook" ] + elif [ "$current_containers" == "gitea" ] then - compose_files="$default_compose_files docker/webhook-override.yml" + 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 down @@ -33,14 +37,28 @@ function show_logs { if [ "$current_containers" == "default" ] then compose_files="$default_compose_files" - elif [ "$current_containers" == "webhook" ] + elif [ "$current_containers" == "gitea" ] then - compose_files="$default_compose_files docker/webhook-override.yml" + 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 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 "default") 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') docker compose $compose_file_flags up --build -d docker compose $compose_file_flags logs -f;; - "webhook") - echo "webhook" > _working/current_containers + "gitea") + echo "gitea" > _working/current_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') docker compose $compose_file_flags up --build -d 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_containers;; "logs") show_logs;; + "ps") + show_ps;; *) echo "ERROR: Unknown param \"$1\"" 2>&1 exit 255;; esac