From 30fb54a485a46c6c7a17349342194e626b394908 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Wed, 29 Nov 2017 17:24:05 +1100
Subject: [PATCH] Minor changes for automated build

---
 .dockerignore  | 4 ++++
 .gitlab-ci.yml | 4 ++--
 Dockerfile     | 1 -
 test/dsm.opt   | 1 +
 test/dsm.sys   | 2 ++
 5 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..29af59a
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+.git/
+lib/
+scripts/
+test/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9680262..529ac86 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,8 +81,8 @@ docker:7-8.1:
   dependencies:
     - test:7-8.1
   script:
-  - docker build -t ${DOCKER_IMAGE}:${VERSION} .
-  - docker tag ${DOCKER_IMAGE}:${VERSION} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
+  - docker pull ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION} || true
+  - docker build --cache-from ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION} -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION} .
   - docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${VERSION}
   tags:
   - docker
diff --git a/Dockerfile b/Dockerfile
index b02b8ba..ac2e2c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,3 @@ VOLUME [ "/tsm" ]
 
 # Starting
 ENTRYPOINT [ "/usr/bin/tsmpipe" ]
-RUN rpm -qa|sort
diff --git a/test/dsm.opt b/test/dsm.opt
index e69de29..3c8e043 100644
--- a/test/dsm.opt
+++ b/test/dsm.opt
@@ -0,0 +1 @@
+COMPRESSAlways Y
diff --git a/test/dsm.sys b/test/dsm.sys
index 3ea8be5..4363814 100644
--- a/test/dsm.sys
+++ b/test/dsm.sys
@@ -16,3 +16,5 @@ SErvername	test
 	TCPBuffsize			32
 	TCPWindowsize		64
 	SSL			No
+
+	PASSWORDDIR /tsm