diff options
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/Makefile | 10 | ||||
| -rw-r--r-- | docker/serverlist.txt | 10 | ||||
| -rwxr-xr-x | docker/spindown.sh | 6 | ||||
| -rwxr-xr-x | docker/spinup.sh | 4 |
5 files changed, 26 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 8632832..779f75d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ # The container can be used for developing and testing # Purposes -FROM fedora:33 +FROM fedora:34 RUN mkdir -p /etc/dserver /var/run/dserver/ /var/log/dserver ADD ./dtail.json /etc/dserver/dtail.json diff --git a/docker/Makefile b/docker/Makefile index 029adf6..eef32d7 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,10 +1,14 @@ -all: +all: build +testrun: build spinup dcat spindown +build: cp ../dserver . docker build . -t dserver:develop rm ./dserver -run: - docker run -p 2222:2222 dserver:develop spinup: ./spinup.sh 10 spindown: ./spindown.sh 10 +dcat: + ../dcat --servers serverlist.txt --files '/etc/passwd' --trustAllHosts +spinup1: + docker run -p 2222:2222 dserver:develop diff --git a/docker/serverlist.txt b/docker/serverlist.txt new file mode 100644 index 0000000..62a6ea6 --- /dev/null +++ b/docker/serverlist.txt @@ -0,0 +1,10 @@ +localhost:2223 +localhost:2224 +localhost:2225 +localhost:2226 +localhost:2227 +localhost:2228 +localhost:2229 +localhost:2230 +localhost:2231 +localhost:2232 diff --git a/docker/spindown.sh b/docker/spindown.sh index 73ed059..2202d22 100755 --- a/docker/spindown.sh +++ b/docker/spindown.sh @@ -5,5 +5,9 @@ declare -i BASE_PORT=2222 for (( i=0; i < $NUM_INSTANCES; i++ )); do port=$[ BASE_PORT + i + 1 ] - docker stop dserver-serv$i + name=dserver-serv$i + echo Stopping $name + docker stop $name + echo Removing $name + docker rm $name done diff --git a/docker/spinup.sh b/docker/spinup.sh index 3890ce6..399d781 100755 --- a/docker/spinup.sh +++ b/docker/spinup.sh @@ -5,5 +5,7 @@ declare -i BASE_PORT=2222 for (( i=0; i < $NUM_INSTANCES; i++ )); do port=$[ BASE_PORT + i + 1 ] - docker run -d --name dserver-serv$i --hostname serv$i -p $port:2222 dserver:develop + name=dserver-serv$i + echo Creating $name + docker run -d --name $name --hostname serv$i -p $port:2222 dserver:develop done |