.gitlab-ci.yml

@@ -5,17 +5,22 @@ stages:
 - build
 
 variables:
-  VERSION: 9.0.1.9-9.0.1.20
+  VERSION: latest
+  AUTO_VERSION: ${CI_COMMIT_TAG:-latest}
   CACHETAG: build
-  DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
+  DOCKER_REGISTRY: registry.leenooks.net
+  DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
 
 services:
-- ${CI_REGISTRY}/leenooks/ci-docker:dind
+- ${DOCKER_REGISTRY}/leenooks/ci-docker:dind
 
 before_script:
 - docker info
 - docker version
-- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
+- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${DOCKER_REGISTRY}
+- echo "CI_PROJECT_PATH ${CI_PROJECT_PATH} CI_COMMIT_TAG ${CI_COMMIT_TAG} CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}"
+- echo "CI_REGISTRY ${CI_REGISTRY} CI_REGISTRY_IMAGE ${CI_REGISTRY_IMAGE} CI ${CI}"
+- echo "AUTO_VERSION ${AUTO_VERSION}"
 
 test:
   stage: test
@@ -30,7 +35,6 @@ test:
 build:
   stage: build
   script:
-  - if [ -f init ]; then chmod 500 init; fi
   - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
   - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSION}

Dockerfile

@@ -1,28 +1,22 @@
 # NAME leenooks/domino
-# VERSION 9.0.1.9-9.0.1.20
+# VERSION 9.0.1.8-9.0.1.18
 
-FROM centos:7
+FROM registry.leenooks.net/leenooks/base:7
 
-RUN yum -y install iproute unzip which perl glibc.i686 libgcc.i686 libgcc && yum clean all
+RUN yum -y install unzip which perl glibc.i686 libgcc.i686 && yum clean all
 RUN groupadd -g 201 servers && useradd -u 202 -g 201 notes 
 
 # Base Version of Domino & FP
 COPY response.dat response-fp.dat /tmp/
-RUN mkdir /tmp/domino && cd /tmp/domino && \
-	curl -SL http://yum.leenooks.net/docker/domino/9.0.1 | tar xf - && \
-	cd /tmp/domino/linux64/domino && ./install -silent -options /tmp/response.dat && \
-	cd /tmp/domino && \
-	curl -SL http://yum.leenooks.net/docker/domino/9.0.1.9 | tar xf - && \
-	cd /tmp/domino/linux64/domino && \
-	NUI_NOTESDIR=/opt/ibm/domino ./install -script /tmp/response-fp.dat && rm -rf /tmp/*
+RUN mkdir /tmp/domino && \
+  cd /tmp/domino && curl -SL http://yum.leenooks.net/docker/domino/9.0.1 | tar xf - && cd /tmp/domino/linux64/domino && ./install -silent -options /tmp/response.dat && \
+  cd /tmp/domino && curl -SL http://yum.leenooks.net/docker/domino/9.0.1.8 | tar xf - && cd /tmp/domino/linux64/domino && NUI_NOTESDIR=/opt/ibm/domino ./install -script /tmp/response-fp.dat && rm -rf /tmp/*
 
 # TRAVELLER
 COPY response-tvl.dat /tmp/
 RUN mkdir /tmp/domino && cd /tmp/domino && \
-	curl -SL http://yum.leenooks.net/docker/traveler/9.0.1.18 | tar xzf - && \
-	./TravelerSetup -f /tmp/response-tvl.dat -i SILENT -l en && \
-	curl -SL http://yum.leenooks.net/docker/traveler/9.0.1.20 | tar xzf - && \
-	./TravelerSetup -f /tmp/response-tvl.dat -i SILENT -l en && rm -rf /tmp/*
+  curl -SL http://yum.leenooks.net/docker/traveler/9.0.1.18 | tar xzf - && ./TravelerSetup -f /tmp/response-tvl.dat -i SILENT -l en && rm -rf /tmp/*
+#  curl -SL http://yum.leenooks.net/docker/traveler/9.0.1.8 | tar xzf - && ./TravelerSetup -f /tmp/response-tvl.dat -i SILENT -l en && \
 
 COPY domino.sh /usr/local/sbin/
 EXPOSE 25 80 110 143 443 465 993 995 1352

domino.sh

@@ -13,9 +13,8 @@ DOMINO_BIN=/opt/ibm/domino/bin/server
 test -x $DOMINO_BIN || exit 5
 
 DOMINO_USR=notes
-DOMINO_DIR=/notesdata
 
-cd ${DOMINO_DIR}
+cd /notesdata
 [ -f .init ] && . ./.init
 
 case "$1" in
@@ -27,8 +26,8 @@ case "$1" in
 		echo "Domino setup is listening on 1352"
 		su ${DOMINO_USR} -c "${DOMINO_BIN} -listen 1352"
 
-		cp -pR ${DOMINO_DIR}/* /data/
-		echo "Please start domino with -v <SRC>:${DOMINO_DIR}"
+		cp -pR /notesdata/* /data/
+		echo "Please start domino with -v <SRC>:/notesdata"
 	;;
 
 	start)
@@ -40,10 +39,6 @@ case "$1" in
 			ulimit -n 60000
 		fi
 
-		# Change our primary interface address for traveler
-		OURIP=$(ip route get $(ip route show 0.0.0.0/0 | grep -oP 'via \K\S+') | grep -oP 'src \K\S+')
-		sed -i -r "s/^(NTS_HOST_IP_ADDR)=([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})?/\1=${OURIP}/" ${DOMINO_DIR}/notes.ini
-
 		echo -n "Starting Domino server"
 		start &
 		wait