Ad5001/DockerBashOOP
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing a lot of bugs.

Browse source
This commit is contained in:
Adsooi 2021-12-30 13:42:39 +01:00
parent ed7dc83f95
commit acdd24b1e3
Signed by: Ad5001
GPG key ID: EF45F9C6AFE20160
1 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
RunningContainer.shc
View file

@ -44,7 +44,7 @@ RunningContainer.constructor() {
# The next argument is the value of the filter, so we skip it. # The next argument is the value of the filter, so we skip it.
i=$(expr "$i" + 1) i=$(expr "$i" + 1)
filterValue=${args[$i]} filterValue=${args[$i]}
this._baseFilter $filterName $filterValue this._baseFilter $filterName "$filterValue"
;; ;;
running | exited | stopped) running | exited | stopped)
this._baseFilter $filterName this._baseFilter $filterName
@ -56,7 +56,12 @@ RunningContainer.constructor() {
done done
this._updateProperties this._updateProperties
# Print error message in STDERR when no containers are found. # Print error message in STDERR when no containers are found.
if [ "$(this.found)" == false ]; then echo "No container found matching those filters." 1>&2; fi if [ "$(this.found)" == false ]; then
echo "No container found matching those filters." 1>&2
else
echo -n "Found $(this.count) containers matching filters: "
echo $(this.name)
fi
} }
# Finds all containers in "docker ps" with a certain field matching a value and returns their lines. # Finds all containers in "docker ps" with a certain field matching a value and returns their lines.
@ -77,16 +82,16 @@ RunningContainer._baseFilter() {
#echo -n "Applying filter $filterName (previous count $(this.lines | wc -l))..." 1>&2 #echo -n "Applying filter $filterName (previous count $(this.lines | wc -l))..." 1>&2
case $filterName in case $filterName in
with_id) with_id)
this.lines = "$(this.findLineByValue 1 == $filterValue)" this.lines = "$(this.findLineByValue 1 == "$filterValue")"
;; ;;
with_image) with_image)
this.lines = "$(this.findLineByValue 2 == $filterValue)" this.lines = "$(this.findLineByValue 2 == "$filterValue")"
;; ;;
created) created)
this.lines = "$(this.findLineByValue 4 == $filterValue)" this.lines = "$(this.findLineByValue 4 == "$filterValue")"
;; ;;
with_status) with_status)
this.lines = "$(this.findLineByValue 5 == $filterValue)" this.lines = "$(this.findLineByValue 5 == "$filterValue")"
;; ;;
running) running)
this.lines = "$(RunningContainer.findLineByValue 5 ~ "Up")" this.lines = "$(RunningContainer.findLineByValue 5 ~ "Up")"
@ -95,12 +100,12 @@ RunningContainer._baseFilter() {
this.lines = "$(this.findLineByValue 5 "~" "Exited")" this.lines = "$(this.findLineByValue 5 "~" "Exited")"
;; ;;
with_port) with_port)
this.lines = "$(this.findLineByValue 6 ~ $filterValue)" this.lines = "$(this.findLineByValue 6 ~ "$filterValue")"
;; ;;
named) named)
lines="$(this.findLineByValue 7 "~" $filterValue)" lines="$(this.findLineByValue 7 "~" "$filterValue")"
if [ -z "$lines" ]; then # Sometimes, when no ports are forwarded, the name is in the 6th field. if [ -z "$lines" ]; then # Sometimes, when no ports are forwarded, the name is in the 6th field.
lines="$(this.findLineByValue 6 "~" $filterValue)" lines="$(this.findLineByValue 6 "~" "$filterValue")"
fi fi
this.lines = "$lines" this.lines = "$lines"
;; ;;
@ -180,3 +185,19 @@ RunningContainer.wait() {
$this.applyToAll wait $@ $this.applyToAll wait $@
} }
# Displays the logs of the containers
# Signature: ([string[] arguments])
RunningContainer.logs() {
$this.applyToAll logs $@
}
# Executes a command to all the containers assigned to the instance.
# Signature: ([string[] options] <string command>)
RunningContainer.exec() {
cmd=${@[-1]}
options=${@:$(exec ${#@} - 1)}
for container in $(this.id); do
$(Docker.Utils.DockerCommand) exec $args $container $cmd
done
}