Update .gitlab-ci.yml

.gitlab-ci.yml

 variables:
-    REVIEW_IMAGE: docker.rz.tu-harburg.de:5000/docker/gitbook:latest
+    REVIEW_IMAGE: docker.rz.tu-harburg.de:5000/docker/nginx--review-apps:latest
+    BUILD_IMAGE: docker.rz.tu-harburg.de:5000/docker/gitbook-itbh-glr:latest
+    
     DOCKER_CONTAINER_NAME: ${CI_PROJECT_PATH_SLUG}-${CI_ENVIRONMENT_SLUG}
+    
+before_script:
+    - sudo docker pull ${BUILD_IMAGE}
+    - sudo docker pull ${REVIEW_IMAGE}
 
 stages:
     - review
     - deploy
     
-pdf:
+review:pdf:
     stage: review
     only:
         - branches
@@ -16,20 +22,23 @@ pdf:
         - development
     script:
         - pwd
-        - sudo docker pull docker.rz.tu-harburg.de:5000/docker/gitbook-glr:latest
-        - mkdir -p book_pdf; sudo docker run --rm -v $(pwd):/source docker.rz.tu-harburg.de:5000/docker/gitbook-glr pdf ./ ./book_pdf/book.pdf
+        - mkdir -p book_pdf; sudo docker run --rm -v $(pwd):/source ${BUILD_IMAGE} pdf ./ ./book_pdf/book.pdf
     artifacts:
         name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
         paths:
             - book_pdf
+    except:
+        - master
     
 review:start:
     stage: review
+    retry: 2
     script:
         - pwd
         - sudo docker run --detach --rm --env VIRTUAL_HOST=${CI_ENVIRONMENT_SLUG} --name ${DOCKER_CONTAINER_NAME} ${REVIEW_IMAGE} || true
-        - sudo docker cp . ${DOCKER_CONTAINER_NAME}:/opt/app
-        - sudo docker exec ${DOCKER_CONTAINER_NAME} gitbook install
+        - sudo docker run --rm -v $(pwd):/source ${BUILD_IMAGE} build
+        - sudo docker cp ./_book/. ${DOCKER_CONTAINER_NAME}:/usr/share/nginx/html
+        - if [ ! -z "${REVIEW_CREDENTIALS}" ]; then mkdir -p ./nginx && echo "${REVIEW_CREDENTIALS}" > ./nginx/credentials && sudo docker cp ./nginx/credentials ${DOCKER_CONTAINER_NAME}:/etc/nginx/htpasswd/credentials; rm -f ./nginx/credentials; fi
     environment:
         name: review/${CI_COMMIT_REF_NAME}
         url: http://${CI_ENVIRONMENT_SLUG}.collaborating.tuhh.de
@@ -60,21 +69,21 @@ review:stop:
     except:
         - master
     
-deploy:
+.deploy:
     stage: deploy
     only:
         - master
+    retry: 2
     tags:
-        - production
+        - ssg
     script:
         - pwd
-        - sudo docker pull docker.rz.tu-harburg.de:5000/docker/gitbook-glr:latest
-        - sudo docker run --rm -v $(pwd):/source docker.rz.tu-harburg.de:5000/docker/gitbook-glr install
-        - sudo docker run --rm -v $(pwd):/source docker.rz.tu-harburg.de:5000/docker/gitbook-glr build
-        - mkdir -p book_pdf; sudo docker run --rm -v $(pwd):/source docker.rz.tu-harburg.de:5000/docker/gitbook-glr pdf ./ ./book_pdf/book.pdf
-        - sshpass -p "$SSH_PASSWD" ssh -p "$SSH_PORT" $SSH_USER@$HOST_NAME "mkdir -p /usr/share/nginx/html/production"
-        - sshpass -p "$SSH_PASSWD" scp -P "$SSH_PORT" -r _book/* $SSH_USER@$HOST_NAME:/usr/share/nginx/html/production
-        - sshpass -p "$SSH_PASSWD" scp -P "$SSH_PORT" -r book_pdf $SSH_USER@$HOST_NAME:/usr/share/nginx/html/production
+        - sudo docker run --rm -v $(pwd):/source ${BUILD_IMAGE} install
+        - sudo docker run --rm -v $(pwd):/source ${BUILD_IMAGE} build
+        - mkdir -p book_pdf; sudo docker run --rm -v $(pwd):/source ${BUILD_IMAGE} pdf ./ ./book_pdf/book.pdf
+        - sshpass -p "${SSH_PASSWD}" ssh -p "${SSH_PORT}" "${SSH_USER}"@"${HOST_NAME}" "mkdir -p /usr/share/nginx/html/production"
+        - sshpass -p "${SSH_PASSWD}" scp -P "${SSH_PORT}" -r _book/* "${SSH_USER}"@"${HOST_NAME}":/usr/share/nginx/html/production
+        - sshpass -p "${SSH_PASSWD}" scp -P "${SSH_PORT}" -r book_pdf "${SSH_USER}"@"${HOST_NAME}":/usr/share/nginx/html/production
     environment:
         name: production
         #url: http://$HOST_NAME$COLON$HTTP_PORT/production/