From e4a461579e3353c181f58a1a1a644361f81b9e2d Mon Sep 17 00:00:00 2001
From: Stewart Williams <16945415+bravostuzero@users.noreply.github.com>
Date: Fri, 19 Oct 2018 14:34:02 +0100
Subject: [PATCH] Add logviewer to docker-compose
---
README.md | 2 ++
docker-compose/logviewer.yml | 33 +++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
create mode 100644 docker-compose/logviewer.yml
diff --git a/README.md b/README.md
index c69daa74..a036dbec 100644
--- a/README.md
+++ b/README.md
@@ -31,11 +31,13 @@ tangodb | MariaDB database holding TANGO database tables
databaseds | TANGO database device server
tangotest | TANGO test device
jive | Container running Jive application
+logviewer | Container running TANGO log viewer
pogo | Pogo TANGO application
astor | Astor application
starter-example | Example service running TANGO Starter device
itango | interactive itango session
+
To start and stop a minimal TANGO system (database and databaseds server),
execute:
diff --git a/docker-compose/logviewer.yml b/docker-compose/logviewer.yml
new file mode 100644
index 00000000..0af413dc
--- /dev/null
+++ b/docker-compose/logviewer.yml
@@ -0,0 +1,33 @@
+#
+# Docker compose file that launches LogViewer, sending output to a remote X11
+# display.
+#
+# Defines:
+# - logviewer: container running LogViewer
+#
+# Requires:
+# - tango.yml
+#
+version: '2'
+
+services:
+ logviewer:
+ build:
+ context: ../docker/tango/tango-java
+ image: ska/tango-java:latest
+ container_name: logviewer
+ depends_on:
+ - databaseds
+ volumes:
+ - $HOME:/hosthome:ro
+ environment:
+ - XAUTHORITY=/hosthome/.Xauthority
+ - DISPLAY=${DISPLAY}
+ - TANGO_HOST=databaseds:10000
+ entrypoint:
+ - /usr/local/bin/wait-for-it.sh
+ - databaseds:10000
+ - --timeout=30
+ - --strict
+ - --
+ - /usr/local/bin/logviewer
--
GitLab