Commit 373aadaf authored by CarlosGC1989's avatar CarlosGC1989
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/client/web into dev

parents 851a9d3f 95bfa91d

.gitlab-ci.yml

+24 −17
Original line number Diff line number Diff line
@@ -90,9 +90,7 @@ prepare-built-version: 
    - grunt

  only:

    - branches

    - tags

  except:

    - master

    - schedules

  cache:

    key: ${CI_COMMIT_REF_NAME}
@@ -108,9 +106,9 @@ prepare-built-version: 
    paths:

      - dist*.tar.gz



docker-build-commit:

docker-build-commit-non-master-branches:

  stage: package

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:
@@ -119,29 +117,40 @@ docker-build-commit: 
    - branches

  except:

    - master

    - schedules

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-build-tag:

docker-build-commit-master-branch:

  stage: package

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:

    - docker:dind

  only:

    - master

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker push ${CI_REGISTRY_IMAGE}



docker-tag-already-built-image:

  stage: package

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:

    - docker:dind

  only:

    - tags

  except:

    - schedules

  script:

    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}

    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} -t ${CI_REGISTRY_IMAGE}:latest .

    - docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}

    - docker push ${CI_REGISTRY_IMAGE}



container_scanning:

container-scanning:

  stage: test-package

  image: docker:stable

  variables:
@@ -151,10 +160,6 @@ container_scanning: 
    - docker:stable-dind

  only:

    - branches

    - tags

  except:

    - master

    - schedules

  script:

    - docker run -d --name db arminc/clair-db:latest

    - docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
@@ -165,7 +170,9 @@ container_scanning: 
    - mv clair-scanner_linux_amd64 clair-scanner

    - chmod +x clair-scanner

    - touch clair-whitelist.yml

    - ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

    - >

      ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log

      -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

  artifacts:

    paths: [gl-sast-container-report.json]
@@ -274,7 +281,7 @@ deploy-pro: 
    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}

  only:

    - tags

    - master

  except:

    - schedules

  when: manual