merge

4 files changed, 32 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index cb47d54..c9e8333 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,14 @@
 *_proprietary.go
+<<<<<<< HEAD
 cache/
 log/
 tags
+=======
+/cache/
+/log/
+/dtail
+/dgrep
+/dcat
+/dmap
+/dserver
+>>>>>>> 7ee0121afed3e7cab6457142f70e411020ab2b21
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{}
 }