Minor changes for automated build

2017-11-29 17:24:05 +11:00 · 2017-11-29 17:24:05 +11:00 · 30fb54a485
commit 30fb54a485
parent f404f9096e
5 changed files with 9 additions and 3 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -0,0 +1,4 @@
+.git/
+lib/
+scripts/
+test/
--- 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
--- a/1
+++ b/1
@ -15,4 +15,3 @@ VOLUME [ "/tsm" ]

 # Starting
 ENTRYPOINT [ "/usr/bin/tsmpipe" ]
-RUN rpm -qa|sort
--- a/test/dsm.opt
+++ b/test/dsm.opt
@ -0,0 +1 @@
+COMPRESSAlways Y
--- a/test/dsm.sys
+++ b/test/dsm.sys
@ -16,3 +16,5 @@ SErvername	test
 	TCPBuffsize			32
 	TCPWindowsize		64
 	SSL			No
+
+	PASSWORDDIR /tsm