diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 777ef09..f4a0083 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ test: build: stage: build script: - - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true + - ( docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true ) && df - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} . - docker push ${CI_REGISTRY_IMAGE}:${VERSION} - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG} diff --git a/Dockerfile b/Dockerfile index d6b4139..445d26a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,14 +8,14 @@ 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.8 | 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 && df && \ + 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 && df && \ + 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/* && df # 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 && 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/* && df # 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/