Commit b2334bf0 authored by Andreas Böttger's avatar Andreas Böttger
Browse files

Merge branch 'development' into '2-path-error' 

Development

See merge request !4
parents 1a0c58fa 567654db

.gitlab-ci.yml

+20 −8
Changes for .gitlab-ci.yml: 20 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ stages: 
    - review

    - deploy

    - clean

    - linkchecker



before_script:

    # https://docs.gitlab.com/ee/ci/ssh_keys/README.html
@@ -147,10 +148,10 @@ deploy: 
        - chmod 644 ~/.ssh/known_hosts

        - eval $(ssh-agent -s)

        - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null

        - ssh -p "$SSH_PORT" "${SSH_USER}"@"${HOST_NAME}" "mkdir -p /opt/app/hopon/templates/studyreader"

        - scp -P "$SSH_PORT" -r _book/* "${SSH_USER}"@"${HOST_NAME}":/opt/app/hopon/templates/studyreader

        - if [ -d book_pdf ]; then ssh -p "${SSH_PORT}" "${SSH_USER}"@"${HOST_NAME}" "mkdir -p /opt/app/hopon/templates/studyreader/book_pdf"; fi

        - if [ -d book_pdf ]; then scp -P "${SSH_PORT}" -r book_pdf/* "${SSH_USER}"@"${HOST_NAME}":"/opt/app/hopon/templates/studyreader/book_pdf"; fi

        - ssh -p "${SSH_PORT}" "${SSH_USER}"@"${HOST_NAME}" "mkdir -p /usr/share/nginx/html"

        - scp -P "${SSH_PORT}" -r _book/* "${SSH_USER}"@"${HOST_NAME}":"/usr/share/nginx/html"

        - if [ -d book_pdf ]; then ssh -p "${SSH_PORT}" "${SSH_USER}"@"${HOST_NAME}" "mkdir -p /usr/share/nginx/html/book_pdf"; fi

        - if [ -d book_pdf ]; then scp -P "${SSH_PORT}" -r book_pdf/* "${SSH_USER}"@"${HOST_NAME}":"/usr/share/nginx/html/book_pdf"; fi

    cache:

        key: "$CI_COMMIT_REF_SLUG"

        paths:
@@ -158,12 +159,11 @@ deploy: 
          - book_pdf

        policy: pull   

    environment:

        name: _$CI_COMMIT_REF_NAME

        name: $CI_COMMIT_REF_NAME

        #url: http://$HOST_NAME$COLON$HTTP_PORT/production/

        #url: https://$PROXY_HOST_NAME/$BASE_PATH/

        #url: https://$PROXY_HOST_NAME/${BASE_DIR}/

        url: https://$PROXY_HOST_NAME/${BASE_DIR}/

        #url: https://$PROXY_HOST_NAME/

        url: https://hopon-newcomers.com/en/studyreader/index.html

        

clean:

  stage: clean
@@ -172,10 +172,22 @@ clean: 
    - chmod 644 ~/.ssh/known_hosts

    - eval $(ssh-agent -s)

    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null

    - ssh -p "${SSH_PORT}" "${SSH_USER}"@"${HOST_NAME}" "rm -rf /opt/app/hopon/templates/studyreader/*"

    - ssh -p "${SSH_PORT}" "${SSH_USER}"@"${HOST_NAME}" "rm -rf /usr/share/nginx/html/*"

  when: manual

  only:

    - master

  environment:

    name: $CI_COMMIT_REF_NAME

    action: stop

    

linkchecker:

  stage: linkchecker

  except:

    - master

  image:

    name: linkchecker/linkchecker

    entrypoint: [""]

  script:

    - linkchecker --recursion-level 10 --threads 10 --no-status --no-robots --no-warnings --check-extern --ignore-url 'https://fonts.gstatic.com/{0,1}$' https://${REVIEW_PROXY_HOST_NAME}/${REVIEW_BASE_DIR}/~${CI_COMMIT_REF_NAME}/

  when: manual