From 89a3f7b0374bab97f31f5862b3558cdf1016e00a Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 22 Nov 2020 11:00:53 +0000 Subject: can run test container for local development purposes --- docker/Dockerfile | 18 ++++++++++++++++++ docker/Makefile | 6 ++++++ docker/dtail.json | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 docker/Dockerfile create mode 100644 docker/Makefile create mode 100644 docker/dtail.json (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..73c141d --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,18 @@ +# This builds a container running DTail server +# The container can be used for developing and testing +# Purposes + +FROM centos:8 +RUN mkdir -p /etc/dserver /var/run/dserver/ /var/log/dserver + +ADD ./dtail.json /etc/dserver/dtail.json +ADD ./dserver /usr/local/bin/dserver + +RUN useradd dserver +RUN chown -R dserver /var/run/dserver /var/log/dserver +USER dserver + +WORKDIR /var/run/dserver +EXPOSE 2222/tcp + +CMD ["/usr/local/bin/dserver", "-relaxedAuth", "-cfg", "/etc/dserver/dtail.json"] diff --git a/docker/Makefile b/docker/Makefile new file mode 100644 index 0000000..5f03a92 --- /dev/null +++ b/docker/Makefile @@ -0,0 +1,6 @@ +all: + cp ../dserver . + docker build . -t dserver:develop + rm ./dserver +run: + docker run -p 2222:2222 dserver:develop diff --git a/docker/dtail.json b/docker/dtail.json new file mode 100644 index 0000000..d923101 --- /dev/null +++ b/docker/dtail.json @@ -0,0 +1,39 @@ +{ + "Client": {}, + "Server": { + "SSHBindAddress": "0.0.0.0", + "MaxConcurrentCats": 2, + "MaxConcurrentTails": 50, + "MaxConnections": 50, + "MapreduceLogFormat" : "default", + "HostKeyFile" : "cache/ssh_host_key", + "HostKeyBits" : 2048, + "Permissions": { + "Default": [ + "readfiles:^/.*$", + "runcommands:^/.*$" + ], + "Users": { + "pbuetow": [ + "readfiles:^/.*$", + "runcommands:^/.*$" + ], + "jblake": [ + "readfiles:^/tmp/foo.log$", + "readfiles:^/.*$", + "readfiles:!^/tmp/bar.log$", + "runcommands:!^/.*$" + ] + } + } + }, + "Common": { + "LogDir" : "/var/log/dserver", + "CacheDir" : "cache", + "TmpDir" : "tmp", + "LogStrategy": "daily", + "SSHPort": 2222, + "DebugEnable": true, + "ExperimentalFeaturesEnable": false + } +} -- cgit v1.2.3 From 75aa66c7a8c55773d37d08f3262fec1440003945 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 22 Nov 2020 11:03:44 +0000 Subject: add readme --- docker/README.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docker/README.md (limited to 'docker') diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 0000000..4d7e610 --- /dev/null +++ b/docker/README.md @@ -0,0 +1,5 @@ +# Docker + +The files in here are used for local development purposes only. E.g. you can +build a dserver Docker container, create multiple instances of it and then +mass connect to them via dtail client. -- cgit v1.2.3 From ae8ffc84331ca72f0d33fff69edd85d6e03d29ae Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 28 Dec 2020 09:40:38 +0000 Subject: refactor --- docker/Dockerfile | 2 +- docker/Makefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index 73c141d..8632832 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ # The container can be used for developing and testing # Purposes -FROM centos:8 +FROM fedora:33 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 5f03a92..796a308 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -4,3 +4,5 @@ all: rm ./dserver run: docker run -p 2222:2222 dserver:develop +spinup: + ./spinup.sh 10 -- cgit v1.2.3 From b41bf72959d72aa422264519b56026e94a09754a Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 28 Dec 2020 09:57:04 +0000 Subject: add scripts to start multiple dserv containers for development purposes --- docker/Makefile | 2 ++ docker/spindown.sh | 9 +++++++++ docker/spinup.sh | 9 +++++++++ 3 files changed, 20 insertions(+) create mode 100755 docker/spindown.sh create mode 100755 docker/spinup.sh (limited to 'docker') diff --git a/docker/Makefile b/docker/Makefile index 796a308..029adf6 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -6,3 +6,5 @@ run: docker run -p 2222:2222 dserver:develop spinup: ./spinup.sh 10 +spindown: + ./spindown.sh 10 diff --git a/docker/spindown.sh b/docker/spindown.sh new file mode 100755 index 0000000..73ed059 --- /dev/null +++ b/docker/spindown.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +declare -i NUM_INSTANCES=$1 +declare -i BASE_PORT=2222 + +for (( i=0; i < $NUM_INSTANCES; i++ )); do + port=$[ BASE_PORT + i + 1 ] + docker stop dserver-serv$i +done diff --git a/docker/spinup.sh b/docker/spinup.sh new file mode 100755 index 0000000..3890ce6 --- /dev/null +++ b/docker/spinup.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +declare -i NUM_INSTANCES=$1 +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 +done -- cgit v1.2.3