diff options
| author | Paul Buetow <pbuetow@mimecast.com> | 2020-11-22 11:00:53 +0000 |
|---|---|---|
| committer | Paul Buetow <pbuetow@mimecast.com> | 2020-11-22 11:00:53 +0000 |
| commit | 89a3f7b0374bab97f31f5862b3558cdf1016e00a (patch) | |
| tree | 5e1a59930e8105d66d6c5cf36d82c8ab0a64e4b5 | |
| parent | 2cb5bc050eeeea4df5e8f57778c107d98f37dfbc (diff) | |
can run test container for local development purposes
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | docker/Dockerfile (renamed from Dockerfile) | 9 | ||||
| -rw-r--r-- | docker/Makefile | 6 | ||||
| -rw-r--r-- | docker/dtail.json | 39 |
4 files changed, 50 insertions, 8 deletions
@@ -17,7 +17,7 @@ install: build cp -pv dmap ${GOPATH}/bin/dmap cp -pv dtail ${GOPATH}/bin/dtail vet: - find . -type d | while read dir; do \ + find . -type d | egrep -v '(./samples|./log|./doc)' | while read dir; do \ echo ${GO} vet $$dir; \ ${GO} vet $$dir; \ done @@ -29,5 +29,3 @@ lint: done test: ${GO} test ./... -v -docker_build: - docker build . -t dtail:latest diff --git a/Dockerfile b/docker/Dockerfile index c1831d4..73c141d 100644 --- a/Dockerfile +++ b/docker/Dockerfile @@ -3,17 +3,16 @@ # Purposes FROM centos:8 +RUN mkdir -p /etc/dserver /var/run/dserver/ /var/log/dserver -RUN mkdir -p /etc/dserver /var/run/dserver - -ADD ./samples/dtail.json.sample /etc/dserver/dtail.json +ADD ./dtail.json /etc/dserver/dtail.json ADD ./dserver /usr/local/bin/dserver RUN useradd dserver -RUN chown -R dserver /var/run/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", "-cfg", "/etc/dserver/dtail.json"] +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 + } +} |