From b637492f8f49954f0cc3e4b04dd76d88c79753d8 Mon Sep 17 00:00:00 2001
From: rfaircloth-splunk <rfaircloth@splunk.com>
Date: Mon, 3 Feb 2020 06:55:39 -0500
Subject: [PATCH] Add version to DockerFile and echo at startup

---
 .circleci/config.yml       | 3 ++-
 docker-compose.yml         | 4 ----
 package/Dockerfile         | 2 ++
 package/VERSION            | 1 +
 package/sbin/entrypoint.sh | 4 +++-
 5 files changed, 8 insertions(+), 6 deletions(-)
 create mode 100644 package/VERSION

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d13a074..9cdeb79 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,8 @@ jobs:
       - versioning/define_version
       - versioning/create_version_file:
          version_file_path: /tmp/workspace/VERSION
-
+      - versioning/create_version_file:
+         version_file_path: package
       - docker/install-docker
       - docker/check:
           registry: $REGISTRY
diff --git a/docker-compose.yml b/docker-compose.yml
index a2b7ae4..81191cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,8 +13,6 @@ services:
     links:
       - splunk
       - sc4s
-    volumes:
-      - sc4s-results:/work/test-results
     environment:
       - SPLUNK_USER=admin
       - SPLUNK_PASSWORD=${SPLUNK_PASSWORD}
@@ -85,7 +83,5 @@ services:
       - ./replay:/work
 
 volumes:
-  sc4s-results:
-    external: true
   splunk-etc:
     external: true
diff --git a/package/Dockerfile b/package/Dockerfile
index 22dbf53..75a9c62 100644
--- a/package/Dockerfile
+++ b/package/Dockerfile
@@ -77,6 +77,8 @@ COPY sbin/entrypoint.sh /
 RUN mkdir -p /opt/syslog-ng/var/data/disk-buffer
 RUN source scl_source enable rh-python36 ;/opt/syslog-ng/sbin/syslog-ng -V
 
+COPY VERSION /
+
 EXPOSE 514
 EXPOSE 601/tcp
 EXPOSE 6514/tcp
diff --git a/package/VERSION b/package/VERSION
new file mode 100644
index 0000000..fedd7e5
--- /dev/null
+++ b/package/VERSION
@@ -0,0 +1 @@
+UNKNOWN
\ No newline at end of file
diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh
index 799b191..d8d8b53 100755
--- a/package/sbin/entrypoint.sh
+++ b/package/sbin/entrypoint.sh
@@ -20,7 +20,9 @@ for file in /opt/syslog-ng/etc/conf.d/local/context/*.example ; do cp --verbose
 cp --verbose -R /opt/syslog-ng/etc/local_config/* /opt/syslog-ng/etc/conf.d/local/config/
 
 echo syslog-ng checking config
-/opt/syslog-ng/sbin/syslog-ng -s >/var/log/syslog-ng.out 2>/var/log/syslog-ng.err
+echo sc4s version=$(cat /version)
+echo sc4s version=$(cat /version) >/var/log/syslog-ng.out
+/opt/syslog-ng/sbin/syslog-ng -s >>/var/log/syslog-ng.out 2>/var/log/syslog-ng.err
 
 echo syslog-ng starting
 exec /opt/syslog-ng/sbin/syslog-ng $@