summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <git@mx.buetow.org>2020-11-22 09:21:44 +0000
committerPaul Buetow <git@mx.buetow.org>2020-11-22 09:21:44 +0000
commit1bc1725bac7cda1f9bc3fcbcf02bf4e6413cf058 (patch)
tree092486ab9fbfa753b37b69e689c70a80c9441f3b
parent1626b6237d87a6ae6238b0d297d7bfb5cf7ddd38 (diff)
add dockerfile for building a dtail server dev/test container
-rw-r--r--Dockerfile19
-rw-r--r--Makefile2
-rw-r--r--internal/server/server.go1
3 files changed, 22 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c1831d4
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,19 @@
+# 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
+
+ADD ./samples/dtail.json.sample /etc/dserver/dtail.json
+ADD ./dserver /usr/local/bin/dserver
+
+RUN useradd dserver
+RUN chown -R dserver /var/run/dserver
+USER dserver
+
+WORKDIR /var/run/dserver
+EXPOSE 2222/tcp
+
+CMD ["/usr/local/bin/dserver", "-cfg", "/etc/dserver/dtail.json"]
diff --git a/Makefile b/Makefile
index 7cf125f..78aece4 100644
--- a/Makefile
+++ b/Makefile
@@ -29,3 +29,5 @@ lint:
done
test:
${GO} test ./... -v
+docker_build:
+ docker build . -t dtail:latest
diff --git a/internal/server/server.go b/internal/server/server.go
index d4255a3..31fa85d 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -34,6 +34,7 @@ type Server struct {
// Mointor log files for pattern (if configured)
cont *continuous
// Wait counter, e.g. there might be still subprocesses (forked by drun) to be killed.
+ // TODO: Remove this counter.
shutdownWaitFor chan struct{}
}